From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1285) id 0770E385E00E; Wed, 27 Sep 2023 08:24:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0770E385E00E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695803059; bh=+P61GPX7Vk0OMkOrEpZlBgjK/2V9bHgVb9LzbDdV7jQ=; h=From:To:Subject:Date:From; b=c+36yRHgIAN/KcHAVlqmX06ca5NyvJikTftrzBg1VwAKGtiVvxqiBN20vhNLCInCv ARF6DElSGI0dhjVNCB6D7rg9oOvikfRg8nmUSXV51bpDHOAWKfysg8wPW8AxX/MxQS RsDjXDszq2ixBWhSzRwI8RaVoqQfCdNi7BRYlVEA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Eric Botcazou To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-7857] ada: Use idiomatic construct in Expand_N_Package_Body X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 6766df630c02f33c8fd24922af131ef3da82fbb3 X-Git-Newrev: 6f6e2d62bbe2a84dada2bace2688f6599502eb0b Message-Id: <20230927082419.0770E385E00E@sourceware.org> Date: Wed, 27 Sep 2023 08:24:19 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6f6e2d62bbe2a84dada2bace2688f6599502eb0b commit r13-7857-g6f6e2d62bbe2a84dada2bace2688f6599502eb0b Author: Eric Botcazou Date: Fri Feb 10 11:15:15 2023 +0100 ada: Use idiomatic construct in Expand_N_Package_Body gcc/ada/ * exp_ch7.adb (Expand_N_Package_Body): Call Defining_Entity to get the entity of the body. Diff: --- gcc/ada/exp_ch7.adb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 7ea39f7ba16..6f9cb16a38f 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -5241,16 +5241,7 @@ package body Exp_Ch7 is Fin_Id => Fin_Id); if Present (Fin_Id) then - declare - Body_Ent : Node_Id := Defining_Unit_Name (N); - - begin - if Nkind (Body_Ent) = N_Defining_Program_Unit_Name then - Body_Ent := Defining_Identifier (Body_Ent); - end if; - - Set_Finalizer (Body_Ent, Fin_Id); - end; + Set_Finalizer (Defining_Entity (N), Fin_Id); end if; end if; end Expand_N_Package_Body;