From patchwork Thu May 25 08:05:22 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: 98845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp195660vqr; Thu, 25 May 2023 01:11:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+fSiFZ01akmdwFqOjq/b+gc1QlOy61UmoqYkLq2TFW8JfQa9mK4x3lmgpK9AmsGtDZf3v X-Received: by 2002:aa7:cd79:0:b0:50b:c380:a929 with SMTP id ca25-20020aa7cd79000000b0050bc380a929mr3563798edb.10.1685002318438; Thu, 25 May 2023 01:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685002318; cv=none; d=google.com; s=arc-20160816; b=GEqCjQiGE6HpA9BAWUZUpbXgIxeh7DHQRckT6ZF39hQABpisO8NQblUs0MUFvEH4Z0 ktn4A5LFqBtoBK17w+2dp0Tv+Kk8ijWhAcn0SwcxoA3PrMOhy6sFFXf8QZKb9Kbtjqih yg6Xv9w5qkW0t2omx/nvYTFo6KXDMbS3xNU9SU9xlehq+MzF1ZhwpV1NY8/tkRAiwUw4 BPOt/2eHm3ysdIITsHaeGzKGOH1MIuMqHkessePa6368mym7A3Q1UzR4xdZGh+jETbWe rszMSttv3cCoRX3WopQB9gZlysaFnAqVZ424+et1aifBJ+3OPIgdpaiZCBtIs4zxwVLw oThA== 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=VAj8uejoSd5U8Lxm2UPPu7yHLHUAONGPH3unbdMIDLQ=; b=zBsJegUcdx83IyhkEdVvy6nay3D5feKEwW9kQloQLmxSeQb23yjW98JeZhbgNDFUof t7qAkg+HNPqa/zSmhdXdHWKAFIM/cXqgnWnRl4rXpGhgvqUKZtjjs2FYRxSDbJib+hJM FORrVTfpVL87HyLbai/s6TYFIuaDvscfSfOpcrtzBr/eMK0NpRCVxhf/qxF7yIpP/n2W +6npN/nJa3Q0mmO64cQk++/NXHgf1XBjRcukkHiDvEQIo+cJTQ3eift5jn5RBCPwTg0+ rtyeEC0UUd8lYFBowREiquZ73gDUM4vS9dy45rvJptCufSAZ9hY0pxwFfcSDyB4zL4Vo iuLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WytvhpcQ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d7-20020aa7ce07000000b0050497afaeedsi555151edv.11.2023.05.25.01.11.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:11:58 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WytvhpcQ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 64950381A88E for ; Thu, 25 May 2023 08:08:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 64950381A88E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685002127; bh=VAj8uejoSd5U8Lxm2UPPu7yHLHUAONGPH3unbdMIDLQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=WytvhpcQxFPl91nLb5KZptJBVLLlTRhwBukKbtAsj0Qi5LivWE6t2UNtd5yVlMZBx WwNhSYbXjE593HUsAq/1QtFqsfsI6XHDB1epPkuNyI1CQkmLh7IScyoi+gAKn0E4Gv pbcjH5fe0oprOyyBBIfg+36Qr9ip5X52Xm00nt70= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 42D2E3857703 for ; Thu, 25 May 2023 08:05:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42D2E3857703 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f60410106cso2001525e9.1 for ; Thu, 25 May 2023 01:05:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685001924; x=1687593924; 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=VAj8uejoSd5U8Lxm2UPPu7yHLHUAONGPH3unbdMIDLQ=; b=bZo012tZiNSm7YSVmBTNBoxk5lHVJpKlQKaUuNsB3Tl6OKi5YHQlMsn3WvR9uN8kw/ OvH1QgPgu+8TtWByG8h/JwVwKh9qdo0dbXZa8JkTQQjlG9DLh62cNMJRj8eMxL63j141 AWmQeE5HIBsOrEQdhJOAbVAP/jKAw7/KoGSGSXGOt3EhkpTMEsHCbMltoFDf6wZbu3hi ZaAH0i+lu4aQaC3t7FO49w3CUswDYTtPkVnQVpy31OVqThA5tDtKPFlxTCWo/yBqPRVU 31G/sWYd9G+r6OsKvUtMzzv2ttl1RE5uluaeeYMCsHLJeBvZFzGYjB+ehXFMmcTEvOYa Vu6A== X-Gm-Message-State: AC+VfDy2DXTs1YQpgn9JEJ1hBsAf2doB3UWM/4F2nyomnlJ3qCceFJ4F wqFOxU1HZHCJY8Y+RxL5FGHwXiDOfM6FvFp33eBX+w== X-Received: by 2002:a7b:ce13:0:b0:3f6:444:b344 with SMTP id m19-20020a7bce13000000b003f60444b344mr1766644wmc.34.1685001924069; Thu, 25 May 2023 01:05:24 -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 13-20020a05600c24cd00b003f4dde07956sm4784259wmu.42.2023.05.25.01.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:05:23 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: =?utf-8?q?Marc_Poulhi=C3=A8s?= Subject: [COMMITTED] ada: Fix incorrect handling of Aggregate aspect Date: Thu, 25 May 2023 10:05:22 +0200 Message-Id: <20230525080522.1955545-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766852991167511077?= X-GMAIL-MSGID: =?utf-8?q?1766852991167511077?= This change fixes 2 incorrect handlings of the aspect. The arguments are now correctly resolved and the aspect is rejected on non array types. gcc/ada/ * sem_ch13.adb (Analyze_One_Aspect): Mark Aggregate aspect as needing delayed resolution and reject the aspect on non-array type. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch13.adb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index d40c70f6ee4..a3819725181 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -2908,10 +2908,10 @@ package body Sem_Ch13 is end case; if Delay_Required - and then (A_Id = Aspect_Stable_Properties or else A_Id = Aspect_Designated_Storage_Model - or else A_Id = Aspect_Storage_Model_Type) + or else A_Id = Aspect_Storage_Model_Type + or else A_Id = Aspect_Aggregate) -- ??? It seems like we should do this for all aspects, not -- just these, but that causes as-yet-undiagnosed regressions. @@ -4203,6 +4203,12 @@ package body Sem_Ch13 is Aitem := Empty; when Aspect_Aggregate => + if Is_Array_Type (E) then + Error_Msg_N + ("aspect% can only be applied to non-array type", Id); + goto Continue; + end if; + Validate_Aspect_Aggregate (Expr); Record_Rep_Item (E, Aspect); goto Continue;