diff options
| author | Steve Baird <baird@adacore.com> | 2023-11-01 14:39:35 -0700 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-11-21 10:57:42 +0100 |
| commit | 87517ca34eb1d65f33fd01e4e5e6fa900cb65f4b (patch) | |
| tree | cfa907b2f693d7300f72ee1ec3d7a57987bd1aad /gcc/ada/sem_aggr.adb | |
| parent | 3bf92fe3f2e4d6915ee6b9e9cb9cd9778a3386df (diff) | |
| download | gcc-87517ca34eb1d65f33fd01e4e5e6fa900cb65f4b.zip gcc-87517ca34eb1d65f33fd01e4e5e6fa900cb65f4b.tar.gz gcc-87517ca34eb1d65f33fd01e4e5e6fa900cb65f4b.tar.bz2 | |
ada: Deep delta aggregates in postconditions
Fix a bug in handling array-valued deep delta aggregates occurring in
postconditions. The bug could result in a spurious compilation failure.
gcc/ada/
* sem_aggr.adb (Resolve_Delta_Array_Aggregate): In the case of a
deep delta choice, the expected type for the expression will
typically not be the component type of the array type, so a call
to Analyze_And_Resolve that assumes otherwise would be an error.
It turns out that such a call, while wrong, is usually harmless
because the expression has already been marked as analyzed. This
doesn't work if the aggregate occurs in a postcondition and, in
any case, we don't want to rely on this. So do not perform the
call in the deep case.
Diffstat (limited to 'gcc/ada/sem_aggr.adb')
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 46a96a3..d3f9a77 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -3696,6 +3696,8 @@ package body Sem_Aggr is Choice : Node_Id; Expr : Node_Id; + Deep_Choice_Seen : Boolean := False; + begin Assoc := First (Deltas); while Present (Assoc) loop @@ -3750,6 +3752,7 @@ package body Sem_Aggr is while Present (Choice) loop if Is_Deep_Choice (Choice, Typ) then pragma Assert (All_Extensions_Allowed); + Deep_Choice_Seen := True; -- a deep delta aggregate Resolve_Deep_Delta_Assoc (Assoc, Typ); @@ -3794,7 +3797,7 @@ package body Sem_Aggr is if Box_Present (Assoc) then Error_Msg_N ("'<'> in array delta aggregate is not allowed", Assoc); - else + elsif not Deep_Choice_Seen then Analyze_And_Resolve (Expression (Assoc), Component_Type (Typ)); end if; end if; |