public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Viljar Indus <indus@adacore.com>
Subject: [COMMITTED] ada: Fix expanding container aggregates with Iterator specification
Date: Tue, 18 Jul 2023 15:13:38 +0200	[thread overview]
Message-ID: <20230718131338.81390-1-poulhies@adacore.com> (raw)

From: Viljar Indus <indus@adacore.com>

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

Tested on x86_64-pc-linux-gnu, committed on master.

---
 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 4c8dcae9d83..dffc5ab721d 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;
 
-- 
2.40.0


                 reply	other threads:[~2023-07-18 13:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230718131338.81390-1-poulhies@adacore.com \
    --to=poulhies@adacore.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=indus@adacore.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).