diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-06-16 10:13:46 +0200 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-06-27 14:05:51 +0200 |
| commit | d47dbbd22fcb4fd26f7a9b66bd99dcf4518deea9 (patch) | |
| tree | 650de5d85cfd5d557bb629fa653ba669731e0318 | |
| parent | cba529bc70be52bbc7796faea212fb694d2d25a4 (diff) | |
| download | gcc-d47dbbd22fcb4fd26f7a9b66bd99dcf4518deea9.zip gcc-d47dbbd22fcb4fd26f7a9b66bd99dcf4518deea9.tar.gz gcc-d47dbbd22fcb4fd26f7a9b66bd99dcf4518deea9.tar.bz2 | |
ada: Fix incorrect handling of iterator specifications in recent change
Unlike for loop parameter specifications where it references an index, the
defining identifier references an element in them.
gcc/ada/
* sem_ch12.adb (Check_Generic_Actuals): Check the component type
of constants and variables of an array type.
(Copy_Generic_Node): Fix bogus handling of iterator
specifications.
| -rw-r--r-- | gcc/ada/sem_ch12.adb | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 43fcff2..61e0ec4 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -7192,11 +7192,16 @@ package body Sem_Ch12 is Set_Is_Hidden (E, False); end if; - -- Check directly the type of the actual objects + -- Check directly the type of the actual objects, including the + -- component type for array types. if Ekind (E) in E_Constant | E_Variable then Check_Actual_Type (Etype (E)); + if Is_Array_Type (Etype (E)) then + Check_Actual_Type (Component_Type (Etype (E))); + end if; + -- As well as the type of formal parameters of actual subprograms elsif Ekind (E) in E_Function | E_Procedure @@ -8520,13 +8525,12 @@ package body Sem_Ch12 is Copy_Descendants; end; - -- Iterator and loop parameter specifications do not have an identifier - -- denoting the index type, so we must locate it through the expression - -- to check whether the views are consistent. + -- Loop parameter specifications do not have an identifier denoting the + -- index type, so we must locate it through the defining identifier to + -- check whether the views are consistent. - elsif Nkind (N) in N_Iterator_Specification - | N_Loop_Parameter_Specification - and then Instantiating + elsif Nkind (N) = N_Loop_Parameter_Specification + and then Instantiating then declare Id : constant Entity_Id := |