From 682c09cebada73fb80e3a36fec6a3b1a09c5781e Mon Sep 17 00:00:00 2001 From: Bob Duff Date: Thu, 19 Sep 2019 08:12:56 +0000 Subject: [PATCH] [Ada] Infinite loop with concatenation and aspect This patch fixes a bug where an array object initialized with a concatenation, and that has an aspect_specification for Alignment, causes the compiler goes into an infinite loop. 2019-09-19 Bob Duff gcc/ada/ * exp_ch3.adb (Rewrite_As_Renaming): Return False if there are any aspect specifications, because otherwise Insert_Actions blows up. gcc/testsuite/ * gnat.dg/concat3.adb: New testcase. From-SVN: r275934 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/exp_ch3.adb | 23 ++++++++++++++++------- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/concat3.adb | 14 ++++++++++++++ 4 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/concat3.adb diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 78b1c0b7db5..7d867bfd5ea 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2019-09-19 Bob Duff + + * exp_ch3.adb (Rewrite_As_Renaming): Return False if there are + any aspect specifications, because otherwise Insert_Actions + blows up. + 2019-09-19 Eric Botcazou * exp_ch6.adb (Add_Simple_Call_By_Copy_Code): Add diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index b08f51c31da..18c6aafe294 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6318,7 +6318,8 @@ package body Exp_Ch3 is ------------------------- function Rewrite_As_Renaming return Boolean is - begin + Result : constant Boolean := + -- If the object declaration appears in the form -- Obj : Ctrl_Typ := Func (...); @@ -6336,12 +6337,12 @@ package body Exp_Ch3 is -- This part is disabled for now, because it breaks GPS builds - return (False -- ??? - and then Nkind (Expr_Q) = N_Explicit_Dereference - and then not Comes_From_Source (Expr_Q) - and then Nkind (Original_Node (Expr_Q)) = N_Function_Call - and then Nkind (Object_Definition (N)) in N_Has_Entity - and then (Needs_Finalization (Entity (Object_Definition (N))))) + (False -- ??? + and then Nkind (Expr_Q) = N_Explicit_Dereference + and then not Comes_From_Source (Expr_Q) + and then Nkind (Original_Node (Expr_Q)) = N_Function_Call + and then Nkind (Object_Definition (N)) in N_Has_Entity + and then (Needs_Finalization (Entity (Object_Definition (N))))) -- If the initializing expression is for a variable with attribute -- OK_To_Rename set, then transform: @@ -6362,6 +6363,14 @@ package body Exp_Ch3 is and then Ekind (Entity (Expr_Q)) = E_Variable and then OK_To_Rename (Entity (Expr_Q)) and then Is_Entity_Name (Obj_Def)); + begin + -- Return False if there are any aspect specifications, because + -- otherwise we duplicate that corresponding implicit attribute + -- definition, and call Insert_Action, which has no place to insert + -- the attribute definition. The attribute definition is stored in + -- Aspect_Rep_Item, which is not a list. + + return Result and then No (Aspect_Specifications (N)); end Rewrite_As_Renaming; -- Local variables diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1e026289249..3755221c56b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-09-19 Bob Duff + + * gnat.dg/concat3.adb: New testcase. + 2019-09-19 Eric Botcazou * gnat.dg/pack26.adb: New testcase. diff --git a/gcc/testsuite/gnat.dg/concat3.adb b/gcc/testsuite/gnat.dg/concat3.adb new file mode 100644 index 00000000000..b4df3fd5eed --- /dev/null +++ b/gcc/testsuite/gnat.dg/concat3.adb @@ -0,0 +1,14 @@ +-- { dg-do run } +-- { dg-options "-g -O0 -gnata" } + +procedure Concat3 is + procedure Show_Bug (S : in String) + is + Str : constant String := S & "-" with Alignment => 4; + begin + null; + end Show_Bug; + +begin + Show_Bug ("BUG"); +end Concat3; \ No newline at end of file -- 2.30.2