diff options
| author | Ed Schonberg <schonberg@adacore.com> | 2021-08-11 12:52:29 -0400 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-10-01 06:13:37 +0000 |
| commit | 8b1a5da38e00348dfc359ef8418de344356ef78e (patch) | |
| tree | 5a55950de3fdcf86dded4cc8f708c13a8a4f227b | |
| parent | 475e1d240086365da3e240fb9199eb1c5ad511f8 (diff) | |
| download | gcc-8b1a5da38e00348dfc359ef8418de344356ef78e.zip gcc-8b1a5da38e00348dfc359ef8418de344356ef78e.tar.gz gcc-8b1a5da38e00348dfc359ef8418de344356ef78e.tar.bz2 | |
[Ada] Implementation of AI12-0212: iterator specs in array aggregates (II)
gcc/ada/
* exp_aggr.adb (Expand_Array_Aggregate,
Two_Pass_Aggregate_Expansion): Increment index for element
insertion within the loop, only if upper bound has not been
reached.
| -rw-r--r-- | gcc/ada/exp_aggr.adb | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index 461e4fa..71bad3c 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -6504,6 +6504,18 @@ package body Exp_Aggr is Expressions => New_List (New_Occurrence_Of (Index_Id, Loc)))); + -- Add guard to skip last increment when upper bound is reached. + + Incr := Make_If_Statement (Loc, + Condition => + Make_Op_Ne (Loc, + Left_Opnd => New_Occurrence_Of (Index_Id, Loc), + Right_Opnd => + Make_Attribute_Reference (Loc, + Prefix => New_Occurrence_Of (Index_Type, Loc), + Attribute_Name => Name_Last)), + Then_Statements => New_List (Incr)); + One_Loop := Make_Loop_Statement (Loc, Iteration_Scheme => Make_Iteration_Scheme (Loc, @@ -6561,11 +6573,10 @@ package body Exp_Aggr is return; elsif Present (Component_Associations (N)) - and then - Nkind (First (Component_Associations (N))) - = N_Iterated_Component_Association - and then Present - (Iterator_Specification (First (Component_Associations (N)))) + and then Nkind (First (Component_Associations (N))) = + N_Iterated_Component_Association + and then + Present (Iterator_Specification (First (Component_Associations (N)))) then Two_Pass_Aggregate_Expansion (N); return; @@ -7389,7 +7400,7 @@ package body Exp_Aggr is elsif Nkind (Comp) = N_Iterated_Element_Association then return -1; - -- TBD : Create code for a loop and add to generated code, + -- ??? Need to create code for a loop and add to generated code, -- as is done for array aggregates with iterated element -- associations, instead of using Append operations. |