OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Fix internal error on multiple nested instantiations

Browse Source 
gcc/ada/

	* sem_ch12.adb (Analyze_Associations) <Explicit_Freeze_Check>: Test
	that the instance is in a statement sequence instead of local scope.
	(Freeze_Subprogram_Body): Use the special delayed placement with
	regard to the parent instance only if its Sloc is strictly greater.
	(Install_Body): Likewise.
This commit is contained in:
Eric Botcazou 2020-10-02 19:15:05 +02:00 committed by Pierre-Marie de Rodat
parent e269fedf8c
commit dcb1cad0e0
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gcc/ada/sem_ch12.adb
View File

@ -1998,7 +1998,7 @@ package body Sem_Ch12 is
Gen_Par : Entity_Id; Gen_Par : Entity_Id;
Needs_Freezing : Boolean; Needs_Freezing : Boolean;
S : Entity_Id; P : Node_Id;
procedure Check_Generic_Parent; procedure Check_Generic_Parent;
-- The actual may be an instantiation of a unit -- The actual may be an instantiation of a unit
@ -2102,18 +2102,15 @@ package body Sem_Ch12 is
Needs_Freezing := True; Needs_Freezing := True;
S := Current_Scope; P := Parent (I_Node);
while Present (S) loop while Nkind (P) /= N_Compilation_Unit loop
if Ekind (S) in E_Block if Nkind (P) = N_Handled_Sequence_Of_Statements
| E_Function
| E_Loop
| E_Procedure
then then
Needs_Freezing := False; Needs_Freezing := False;
exit; exit;
end if; end if;
S := Scope (S); P := Parent (P);
end loop; end loop;
if Needs_Freezing then if Needs_Freezing then
@ -9084,7 +9081,7 @@ package body Sem_Ch12 is
-- --
-- procedure P ... -- this body freezes Parent_Inst -- procedure P ... -- this body freezes Parent_Inst
-- --
-- package Inst is new ... -- procedure Inst is new ...
-- --
-- In this particular scenario, the freeze node for Inst must be -- In this particular scenario, the freeze node for Inst must be
-- inserted in the same manner as that of Parent_Inst - before the -- inserted in the same manner as that of Parent_Inst - before the
@ -9097,7 +9094,7 @@ package body Sem_Ch12 is
elsif List_Containing (Get_Unit_Instantiation_Node (Par)) = elsif List_Containing (Get_Unit_Instantiation_Node (Par)) =
List_Containing (Inst_Node) List_Containing (Inst_Node)
and then Sloc (Freeze_Node (Par)) < Sloc (Inst_Node) and then Sloc (Freeze_Node (Par)) <= Sloc (Inst_Node)
then then
Insert_Freeze_Node_For_Instance (Inst_Node, F_Node); Insert_Freeze_Node_For_Instance (Inst_Node, F_Node);
@ -9938,7 +9935,7 @@ package body Sem_Ch12 is
if Parent (List_Containing (Get_Unit_Instantiation_Node (Par))) if Parent (List_Containing (Get_Unit_Instantiation_Node (Par)))
= Parent (List_Containing (N)) = Parent (List_Containing (N))
and then Sloc (Freeze_Node (Par)) < Sloc (N) and then Sloc (Freeze_Node (Par)) <= Sloc (N)
then then
Insert_Freeze_Node_For_Instance (N, F_Node); Insert_Freeze_Node_For_Instance (N, F_Node);
else else