From 2d751b416a86ea4362c291397fa5b3f51395d5d5 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 10 Feb 2023 11:15:15 +0100 Subject: [PATCH] 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. --- 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 9ec03b7e4cd..db2644fb287 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -5262,16 +5262,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; -- 2.11.4.GIT