From patchwork Tue Jul 18 13:13:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 122031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1741227vqt; Tue, 18 Jul 2023 06:21:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlF8Mi39Nm30uj4Gm7Y8E8gd7qZEBszwR4j5ynYyHYhDFouqF60bHjx3Wrz2cxx5LNFvaple X-Received: by 2002:a17:907:7413:b0:993:f4cd:34b3 with SMTP id gj19-20020a170907741300b00993f4cd34b3mr11036031ejc.43.1689686479997; Tue, 18 Jul 2023 06:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689686479; cv=none; d=google.com; s=arc-20160816; b=sS3Sc12C5CBCHgT0a1pOx0PTZfg80F59p003Q6nU+kSZ+VUPu47mhNyDjGJRf5ZATD HEz64k/TqN2RZ4DayvJV8Ts3XGKNfkM5sLDwa38q1U/rFjuRAhA4QM3W+xid0xBYoUMf Om3DlPMEwz/0VQS4ZbC4LJ1CyJiDImJvCOFsIWWG09hvTS6roZTvNgNr3Hhx5klmb2h+ nSduXr2vJOlJjZ0QYegivUV7Y3wzdVkG/+puZ4Gsi5dnxRVmJQQs31xP7rl5Mkc5/hq1 jbHpD0Ix6SUxyYjp7cjsV9wwkLjAt6jukY34smsetC5GftfKPu3r6T9CDzvesbdDcQgO BKnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=e4n3tod+0sEpW8d/xG8lb5g/VEey4xz23y6v/vL4sGQ=; fh=qgQjCcgTOS4PqJmTmRtvqfvUI8DwWNjxI7TYi3qv/40=; b=ls1q0NE7SxtJ9fCkNagWLc0Jk7l87krgvMep2IxyyXpNXBFWgGB989cK+qbCIN25Rk lXNWGW5l+hf6ZJF4uTkLEMdq+gb507CbMebov17VdkjPlaJ0womgK87NjsO4K5ayo44l MC15F/uIHRP6wvoKR5UMmnbrWBqlGemacTmOhcTwNIPAVHzge6uZgGvCb51qrOQHzk6o TGO6s68gEu1tvzg6/plBDmywBwaZeXa6rXKJ2Z9KuCpcjoZXIEnl1HO+y0frph4t3bwm CG3rYjG0PqnjAN6sp1KWa4iPuTxS5DFgDE+rx4y9d+j3ATR0Q3fEL9n/sfdXp4oema2Q 2hRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vO+6Q8vQ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id ha14-20020a170906a88e00b009938899a39bsi1093484ejb.861.2023.07.18.06.21.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 06:21:19 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vO+6Q8vQ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 15ACE387606A for ; Tue, 18 Jul 2023 13:16:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15ACE387606A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689686195; bh=e4n3tod+0sEpW8d/xG8lb5g/VEey4xz23y6v/vL4sGQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=vO+6Q8vQfGVgFoegntRfDXnoFoWbHUaeT9kP4TmXOb4Aw0RcZ+ipOJV2isjQ26Fd9 gV2kFtdhxmCji2Nvx1AhyHj73jWtdraMrKMItavpqE41Md/FH3ik9fOE9eCik9r/2g 6kUsKc1Z+0pTnIbHd9zN+jiOTABCgOOigyIoRgdY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id F379A385AFA4 for ; Tue, 18 Jul 2023 13:13:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F379A385AFA4 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3110ab7110aso5933624f8f.3 for ; Tue, 18 Jul 2023 06:13:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689686019; x=1690290819; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e4n3tod+0sEpW8d/xG8lb5g/VEey4xz23y6v/vL4sGQ=; b=AKc8vTneRZZ7AtDi0X9SRsfnNGhd+faEk3B2rTL+qI83ptYLeVplhQph6xtt8rFIsQ gRATd2wdoH5QGkMPhmLDReNxJjHxJsvlmG1gNB/8V1Ujt9ccwcQA78pfhSk07KAZTYl8 5CGKOW3RENF5ar2m/vAVZbcRtTqnpmc4jpTF6MYvyPSt6kjVxsY1RG9nimhzj/JZIj/0 GcMtVMy9qHdLRnKEkfaH3zgS6sqmgjuWje+HQf8F4Hgg9VYzkfoDG0UASbPEJKXbFzph CuQd7uD92PZ2iXpuIpMj+W8kUM49xI1lCX4HoPkG3b/JXEK0V95jwab6pNHyT/2P9tvo /5Dg== X-Gm-Message-State: ABy/qLavbFp0rLT9XKuEoKDHImlpke9DO/vviOErBtCCWlB/ld074ZJ3 suZ0frUawEXx6diXPpobCOCju9GQOFLalYBao6rq5A== X-Received: by 2002:a5d:60c6:0:b0:315:9de4:92f0 with SMTP id x6-20020a5d60c6000000b003159de492f0mr12703299wrt.5.1689686019743; Tue, 18 Jul 2023 06:13:39 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id l18-20020adffe92000000b0031433d8af0dsm2410494wrr.18.2023.07.18.06.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 06:13:39 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Viljar Indus Subject: [COMMITTED] ada: Fix expanding container aggregates with Iterator specification Date: Tue, 18 Jul 2023 15:13:38 +0200 Message-Id: <20230718131338.81390-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771764690319990325 X-GMAIL-MSGID: 1771764690319990325 From: Viljar Indus 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;