From patchwork Thu Dec 1 13:55:50 2022 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: 28388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp273743wrr; Thu, 1 Dec 2022 05:59:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf44A5bd+aBZ1g9UOv4XyCfHkXxxrkU8qvH4J+E3BhP5qftqFTzf4UKprZPk++oU4MHHCkus X-Received: by 2002:a05:6402:150:b0:468:fdc3:6b44 with SMTP id s16-20020a056402015000b00468fdc36b44mr42821893edu.388.1669903161644; Thu, 01 Dec 2022 05:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669903161; cv=none; d=google.com; s=arc-20160816; b=IcDV0EpzIEq+WqyApK1DWB3UqlJTg5/ValB1vBxECeMS37GlSGixtrJQAALRVl9WVs OW7rY2TtV4vnY3Moizx2Ik6Ujzv7UZ6cmU8OMi2XCbX2/MH1VIbKzw6HkQepB9MLuZMu hw3A8ftnSN7VubII/p61s1q7tfEAEEQgyftoeGXP41eMbev2zXR6r5cv6GDR9NLsE52T FAzxyqqJzEu2tU43l609FBNyDjHRrbKGVKU5j/hvmIsClcPbPgZsAGqiMQRggqwTQVTz e8MtYXqSyFU7xwIxrB+PORdG+/8hYvxBldAzteBZgyPL8BcnRCR5oRnP7QiFPd9q/X97 MxPg== 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=KV74XLF/KOBQHzRmTq0/YUQ4f90nb5CgDy4XKlgDTMg=; b=vMgcb8b04KBXjBYz9/vkvLRcbBf2b01boiIPiObBw3XHRqtGoSc1meCzywWORRBpIa dCxQYMiq3j1YiB4RWauIbywAYZ9L268l5lkxSWuKgWGJSKWIQdBrGZzwmP7NMMYl105Q dtCJK20KI+yL/Y/tKGENN0vT9CfzEUsjFWDEhnWdIYt6qL36BsJiD3txjpFhN9gWGH+x OObEshZ58JrCGQ8QRNYnWfp7rvRyzKg0NvOfjQY0I2d0Im3YqCfVNvsvT4cKCEEFG33+ W1R4VXHk2KaWioTYuII+2RVDu+nHTXCKAE2QXJO2BzPb+t0qCjzYkZZiXwRw9RXaiPDs DTUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=F93OJ0Fi; 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 gs10-20020a1709072d0a00b007ad69eba328si4674416ejc.539.2022.12.01.05.59.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 05:59:21 -0800 (PST) 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=F93OJ0Fi; 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 A19F53858407 for ; Thu, 1 Dec 2022 13:59:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A19F53858407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669903152; bh=KV74XLF/KOBQHzRmTq0/YUQ4f90nb5CgDy4XKlgDTMg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=F93OJ0FikNi0sSnLwMHmcfVMJf8tfRo1sgaIuytRNiV28cq2YKtMeD3t4fVN9qekH eyGm9s+k4bokoglFOeuWaoJh98UAM/JNKGLxzZ3aaRhalIFpl6tRs/cSOWf/j6ngfK pVI6XgfwuJTcuDJHADua3gakir7RAd9lbjrDmRso= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 2A6B7385782B for ; Thu, 1 Dec 2022 13:55:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2A6B7385782B Received: by mail-wm1-x329.google.com with SMTP id m19so1212144wms.5 for ; Thu, 01 Dec 2022 05:55:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KV74XLF/KOBQHzRmTq0/YUQ4f90nb5CgDy4XKlgDTMg=; b=QWCxObT+9tltyJKSkBf1Ljz5ZyYwij29tUxaz9oaPKBc4hudYxC+pns0zVvX8rZxTm SF4wnEvUG5LLdjS2ZvVdVXm1G/hvt6FGxZka1tdZkFQiaoU8KbvKFEdLQ3X19BubbAA1 RCN4s1SGLc1FwcpoLPrbSdw6kGZ6QPw4Q2syY5WurUFeA0mWjBBH1jbE9e1N+WPcCQnz MaJcFUUydHrittCwgxZvJmBWPTt8NvrJN3DpuJ6qYUiU5LXjtrP1KgYrBtJbbCNig+DK 67klYUutMaZdE8oUb0O1woh7ftdgM1DQZm75Pl5VbSTalWTGSfaLTNaEozGycaYG2lB5 Q2Fw== X-Gm-Message-State: ANoB5pkGnI5zIQX3z5OUaxDjNMH+ebYSxhcx5+33iEUEBj6skECSVyY3 5GaxdY27wM+O0+6++NNgziVTVLmI4V+3kA== X-Received: by 2002:a1c:7501:0:b0:3cf:61a3:464e with SMTP id o1-20020a1c7501000000b003cf61a3464emr42052128wmc.111.1669902953026; Thu, 01 Dec 2022 05:55:53 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id z10-20020adfec8a000000b00236576c8eddsm4572954wrn.12.2022.12.01.05.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 05:55:52 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Steve Baird Subject: [COMMITTED] ada: Enforce Aggregate aspect legality rule Date: Thu, 1 Dec 2022 14:55:50 +0100 Message-Id: <20221201135550.458256-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 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 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?1751020377451171869?= X-GMAIL-MSGID: =?utf-8?q?1751020377451171869?= From: Steve Baird Ada 2022 requires that an Aggregate aspect specification shall specify a a name for at least one of Add_Named, Add_Unnamed, or Assign_Indexed. Enforce this rule. gcc/ada/ * sem_ch13.adb (Validate_Aspect_Aggregate): Reject illegal case where none of Add_Named, Add_Unnamed, and Assign_Indexed are specified. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch13.adb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index a4782747aff..71eabb4f627 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -15729,6 +15729,12 @@ package body Sem_Ch13 is return; end if; + elsif No (Add_Named_Subp) + and then No (Add_Unnamed_Subp) + and then No (Assign_Indexed_Subp) + then + Error_Msg_N ("incomplete specification for aggregate", N); + elsif Present (New_Indexed_Subp) /= Present (Assign_Indexed_Subp) then Error_Msg_N ("incomplete specification for indexed aggregate", N); end if;