diff options
author | Piotr Trojanek <trojanek@adacore.com> | 2022-07-31 22:27:13 +0200 |
---|---|---|
committer | Marc Poulhiès <poulhies@adacore.com> | 2022-09-05 09:21:07 +0200 |
commit | b26be61b8d23cc9d7a4e36feeadd9c8f0ec8b909 (patch) | |
tree | 649fbf11938047efcf93e9e96d3ccb4901598a86 | |
parent | e35ecc880f405e06fdbd2f700863477fd2f25186 (diff) | |
download | gcc-b26be61b8d23cc9d7a4e36feeadd9c8f0ec8b909.zip gcc-b26be61b8d23cc9d7a4e36feeadd9c8f0ec8b909.tar.gz gcc-b26be61b8d23cc9d7a4e36feeadd9c8f0ec8b909.tar.bz2 |
[Ada] Fix insertion of a runtime check for null array aggregate
A null array aggregate of Ada 2022 requires a conditional runtime check
that was inserted as an if-statement. While gigi can handle statements
inserted into a list of declarations, in GNATprove such a statement will
cause a crash. It is better to insert a conditional raise node, which is
properly handled by both gigi and GNATprove.
gcc/ada/
* sem_aggr.adb (Resolve_Null_Array_Aggregate): Insert check as a
Raise_Constraint_Error node and not an If_Statement.
-rw-r--r-- | gcc/ada/sem_aggr.adb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 4ad4a29..dddc75f 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -4113,12 +4113,10 @@ package body Sem_Aggr is -- including modular). Check := - Make_If_Statement (Loc, + Make_Raise_Constraint_Error (Loc, Condition => Make_Op_Le (Loc, New_Copy_Tree (Lo), New_Copy_Tree (Hi)), - Then_Statements => - New_List (Make_Raise_Constraint_Error - (Loc, Reason => CE_Range_Check_Failed))); + Reason => CE_Range_Check_Failed); Insert_Action (N, Check); |