diff options
Diffstat (limited to 'gcc/ada/sem_aggr.adb')
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 4d8a67d9a17..e9d63ee2562 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -960,7 +960,7 @@ package body Sem_Aggr is Aggr_Typ : constant Entity_Id := Etype (Typ); -- This is the unconstrained array type, which is the type - -- against which the aggregate is to be resoved. Typ itself + -- against which the aggregate is to be resolved. Typ itself -- is the array type of the context which may not be the same -- subtype as the subtype for the final aggregate. @@ -977,7 +977,7 @@ package body Sem_Aggr is -- formal parameter. Consequently we also need to test for -- N_Procedure_Call_Statement or N_Function_Call. - Set_Etype (N, Aggr_Typ); -- may be overridden later on. + Set_Etype (N, Aggr_Typ); -- may be overridden later on -- Ada 0Y (AI-231): Propagate the null_exclusion attribute to the -- components of the array aggregate @@ -1399,6 +1399,12 @@ package body Sem_Aggr is end if; end if; + -- Ada 0Y (AI-231): Propagate the type to the nested aggregate. + -- Required to check the null-exclusion attribute (if present). + -- This value may be overridden later on. + + Set_Etype (Expr, Etype (N)); + Resolution_OK := Resolve_Array_Aggregate (Expr, Nxt_Ind, Nxt_Ind_Constr, Component_Typ, Others_Allowed); |