diff options
| author | Viljar Indus <indus@adacore.com> | 2023-07-06 16:02:19 +0300 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-07-18 15:11:47 +0200 |
| commit | c57fbb120dabb4fee85cc12ae99abe5060213d93 (patch) | |
| tree | e113c92756d5d64075fd3fc9c9e8232f99dfe379 | |
| parent | 99c419b2a8ce033e8be08f656edd350d97f72125 (diff) | |
| download | gcc-c57fbb120dabb4fee85cc12ae99abe5060213d93.zip gcc-c57fbb120dabb4fee85cc12ae99abe5060213d93.tar.gz gcc-c57fbb120dabb4fee85cc12ae99abe5060213d93.tar.bz2 | |
ada: Avoid iterator conflicts in container aggregates
Create temporary scope for the iterators defined in a
container aggregate so that it would not be put to the
same scope where the expression was used. This would
otherwise lead to multiple aggregates with iterators that have
the same name leading to a name conflict.
gcc/ada/
* sem_aggr.adb (Resolve_Iterated_Association): Add temporary scope
when analyzing the Iterator Specification. Use preanalysis instead
of Analysis to avoid polluting the tree.
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index ecd508a..364217d 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -3231,11 +3231,24 @@ package body Sem_Aggr is Typ := Key_Type; elsif Present (Iterator_Specification (Comp)) then + -- Create a temporary scope to avoid some modifications from + -- escaping the Analyze call below. The original Tree will be + -- reanalyzed later. + + Ent := New_Internal_Entity + (E_Loop, Current_Scope, Sloc (Comp), 'L'); + Set_Etype (Ent, Standard_Void_Type); + Set_Parent (Ent, Parent (Comp)); + Push_Scope (Ent); + Copy := Copy_Separate_Tree (Iterator_Specification (Comp)); Id_Name := Chars (Defining_Identifier (Iterator_Specification (Comp))); - Analyze (Copy); + Preanalyze (Copy); + + End_Scope; + Typ := Etype (Defining_Identifier (Copy)); else |