From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x329.google.com with SMTP id m19so1212144wms.5 for ; Thu, 01 Dec 2022 05:55:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KV74XLF/KOBQHzRmTq0/YUQ4f90nb5CgDy4XKlgDTMg=; b=jlnTXuCmaVVU+T4QBwu6rLlFgIYYVzGmXzPg4BHFlDXlpQ5ZURsuUHAt0qbDCIzWeP esI+Vgr4x6tOfN8tUSfokXqVG4vwoiDBWGdf4ogqfd916i8QBDt8q3+6qgwgeFS0i+Jz j2fTZtUfjGWtsV2JvQt20fHM94Nnl59daDXqbV2aFCxzTytXi/jnp6dm3V/kqtJdJbpK 3guS9bSLZYDM2YdiG0SVWt/W0EtZZyVyvgc7K24iiHb7VPFwVeXhm70F69fRsa/SEPkD 8Vk8keGqU4ZSbRL/Dh2xgRHB4/fDxCkGCCTuKitmeFY9ZjlV8elT2oNJO0NGRbuCUCqG x6vQ== 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-Google-Smtp-Source: AA0mqf6FOdYI1N/hjRgi9hUuVbYgBVlzeFBC/rY9/L0fxjtAYfHFx5qQD2ujgwwKhiHduYVXiqlnuQ== 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) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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; -- 2.34.1