From a6ca70c6744ed6019b1ddbc41c8a09a45331e5bb Mon Sep 17 00:00:00 2001
From: Viljar Indus <indus@adacore.com>
Date: Wed, 5 Jul 2023 12:28:56 +0300
Subject: [PATCH] ada: Fix expanding container aggregates with Iterator
specification
The compiler should use unnamed addition methods such as Append
when expanding a container aggregate with Iterator Specification.
gcc/ada/
* exp_aggr.adb (Expand_Container_Aggregate): Use the positional
addition method only when dealing with a container aggregate
without an Iterator Specification e.g. with a loop parameter
specification
---
gcc/ada/exp_aggr.adb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index 4c8dcae9d83f..dffc5ab721db 100644
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -7259,8 +7259,11 @@ package body Exp_Aggr is
-- Iterated component association. Discard
-- positional insertion procedure.
- Add_Named_Subp := Assign_Indexed_Subp;
- Add_Unnamed_Subp := Empty;
+ if not Present (Iterator_Specification (Comp)) then
+ Add_Named_Subp := Assign_Indexed_Subp;
+ Add_Unnamed_Subp := Empty;
+ end if;
+
Expand_Iterated_Component (Comp);
end if;
--
GitLab