git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Ada] Fix expansion of blocks in loops inside elaboration code 

2018-07-16  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* exp_ch7.adb (Check_Unnesting_Elaboration_Code): Handle loops that
	contain blocks in the elaboration code for a package body. Create the
	elaboration subprogram wrapper only if there is a subprogram
	declaration in a block or loop.

From-SVN: r262728
This commit is contained in:
Ed Schonberg 2018-07-16 14:12:18 +00:00 committed by Pierre-Marie de Rodat
parent afe9c53918
commit 4aba11eeb3
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ada/ChangeLog
View File

@ -1,3 +1,10 @@
2018-07-16 Ed Schonberg <schonberg@adacore.com>
* exp_ch7.adb (Check_Unnesting_Elaboration_Code): Handle loops that
contain blocks in the elaboration code for a package body. Create the
elaboration subprogram wrapper only if there is a subprogram
declaration in a block or loop.
2018-07-16 Ed Schonberg <schonberg@adacore.com>
* exp_ch4.adb (Expand_Set_Membership): Use New_Copy_Tree to perform a

47
gcc/ada/exp_ch7.adb
View File

@ -3994,6 +3994,34 @@ package body Exp_Ch7 is
Elab_Call : Node_Id;
Elab_Proc : Entity_Id;
Stat : Node_Id;
function Contains_Subprogram (Blk : Entity_Id) return Boolean;
-- Check recursively whether a loop or block contains a subprogram
-- that may need an activation record.
--------------------------
-- Contains_Subprogram --
--------------------------
function Contains_Subprogram (Blk : Entity_Id) return Boolean is
E : Entity_Id;
begin
E := First_Entity (Blk);
while Present (E) loop
if Is_Subprogram (E) then
return True;
elsif Ekind_In (E, E_Block, E_Loop)
and then Contains_Subprogram (E)
then
return True;
end if;
Next_Entity (E);
end loop;
return False;
end Contains_Subprogram;
begin
if Unnest_Subprogram_Mode
@ -4002,8 +4030,10 @@ package body Exp_Ch7 is
then
Stat := First (Statements (Handled_Statement_Sequence (N)));
while Present (Stat) loop
exit when Nkind (Stat) = N_Block_Statement
and then Present (Identifier (Stat));
exit when ((Nkind (Stat) = N_Block_Statement
and then Present (Identifier (Stat)))
or else Nkind (Stat) = N_Loop_Statement)
and then Contains_Subprogram (Entity (Identifier (Stat)));
Next (Stat);
end loop;
@ -4035,17 +4065,18 @@ package body Exp_Ch7 is
Analyze (Elab_Call);
-- The scope of all blocks in the elaboration code is now the
-- constructed elaboration procedure. Nested subprograms within
-- those blocks will have activation records if they contain
-- references to entities in the enclosing block.
-- The scope of all blocks and loops in the elaboration code is
-- now the constructed elaboration procedure. Nested subprograms
-- within those blocks will have activation records if they
-- contain references to entities in the enclosing block.
Stat :=
First (Statements (Handled_Statement_Sequence (Elab_Body)));
while Present (Stat) loop
if Nkind (Stat) = N_Block_Statement
and then Present (Identifier (Stat))
if (Nkind (Stat) = N_Block_Statement
and then Present (Identifier (Stat)))
or else Nkind (Stat) = N_Loop_Statement
then
Set_Scope (Entity (Identifier (Stat)), Elab_Proc);