From: Steve Baird Date: Wed, 1 Nov 2023 21:39:35 +0000 (-0700) Subject: ada: Deep delta aggregates in postconditions X-Git-Tag: basepoints/gcc-15~4478 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87517ca34eb1d65f33fd01e4e5e6fa900cb65f4b;p=thirdparty%2Fgcc.git 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. --- diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 46a96a31a007..d3f9a7731919 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;