]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ada: Use idiomatic construct in Expand_N_Package_Body
authorEric Botcazou <ebotcazou@adacore.com>
Fri, 10 Feb 2023 10:15:15 +0000 (11:15 +0100)
committerMarc Poulhiès <poulhies@adacore.com>
Mon, 22 May 2023 08:46:13 +0000 (10:46 +0200)
gcc/ada/

* exp_ch7.adb (Expand_N_Package_Body): Call Defining_Entity to get
the entity of the body.

gcc/ada/exp_ch7.adb

index 9ec03b7e4cd2cf619f419f3ab135dc899a9c1ac9..db2644fb287a616abe7334c6377c6baf43c56da4 100644 (file)
@@ -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;