From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 29BF23858C56 for ; Mon, 28 Mar 2022 13:29:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29BF23858C56 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-93Yzi3ftOXe6Vk-RMLYXzA-1; Mon, 28 Mar 2022 09:28:58 -0400 X-MC-Unique: 93Yzi3ftOXe6Vk-RMLYXzA-1 Received: by mail-qv1-f71.google.com with SMTP id cl19-20020a05621404f300b0044103143211so11318247qvb.10 for ; Mon, 28 Mar 2022 06:28:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JJ8s6SzDNbDB+Pmu4d2GKlxzg747PhY/qf1JW7T6r4o=; b=AGoVwqhZFKCP7t8upU6BwRqQ+a8BAXfJWOb+Xdpn0LHmBYU3l7zmcPiT2bI2Jb68wQ GuAGF5yqRCbH6yuMCXHXVnbEAOmBKrP9OqKGAgo0d/o0j+0Uk6Krbw88ItLxH4Wj7+4h S3Csfhk1FgEy5iHezNJ09jU4vPDFwMsu3y+F6VQAamY/WUqA0JMCA4qljuolXcvvvRYp 54axcdd3JBhx36ZizWCQyAa7wWhH4sAbabySSKBjxBFjdpxP8Ppsk4FrSdKOMFrOENQg oEAGmkYQAvKzMJJitB55unO9OhQtUvtd4OUnYN82Su1DchNL3Y/5A8VyZnmc6lyEmf/D EhfA== X-Gm-Message-State: AOAM531256j7dQ2hr4Uqbo/Ok7IQZyderfcmhvZ6NoraOfsCEVpNdU5h HZzQKOeFpJ0Ap+543wlhd9fj0Dqwh/5sugY24uTOuiNDk8mdt+FL6xmbW3peOOmcgT7d8+vpiVW sv1eu7alwGVXQOypOqLf1idSq2t0LUD/vedAmU9bvTgzYD0KzBGJF7KTCY2D3SXaU+zM= X-Received: by 2002:a05:620a:172a:b0:67e:cda9:65ef with SMTP id az42-20020a05620a172a00b0067ecda965efmr15999174qkb.247.1648474137657; Mon, 28 Mar 2022 06:28:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+yWeJyqwCjDB+7Nk9S9Wg6yC5EjBXjqo8x9TTuQOsnC7rC0bRUwb9YET4sxf4GYfqj1jveQ== X-Received: by 2002:a05:620a:172a:b0:67e:cda9:65ef with SMTP id az42-20020a05620a172a00b0067ecda965efmr15999151qkb.247.1648474137356; Mon, 28 Mar 2022 06:28:57 -0700 (PDT) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id x6-20020a376306000000b0067b32a8568esm8168179qkb.101.2022.03.28.06.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 06:28:56 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: reject concept w/ multiple tparm lists [PR105067] Date: Mon, 28 Mar 2022 09:28:52 -0400 Message-Id: <20220328132852.4071897-1-ppalka@redhat.com> X-Mailer: git-send-email 2.35.1.677.gabf474a5dd MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Mon, 28 Mar 2022 13:29:05 -0000 We weren't rejecting a concept declared with multiple template parameter lists. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/105067 gcc/cp/ChangeLog: * pt.cc (finish_concept_definition): Require that a concept is declared with exactly one template parameter list. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/concepts-err4.C: New test. --- gcc/cp/pt.cc | 6 ++++++ gcc/testsuite/g++.dg/cpp2a/concepts-err4.C | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-err4.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 173bc3a8c7f..bd937499934 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -28775,6 +28775,12 @@ finish_concept_definition (cp_expr id, tree init) return error_mark_node; } + if (current_template_depth > 1) + { + error_at (loc, "concept %qE has multiple template parameter lists", *id); + return error_mark_node; + } + /* Initially build the concept declaration; its type is bool. */ tree decl = build_lang_decl_loc (loc, CONCEPT_DECL, *id, boolean_type_node); DECL_CONTEXT (decl) = current_scope (); diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-err4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-err4.C new file mode 100644 index 00000000000..57a96a095c7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-err4.C @@ -0,0 +1,6 @@ +// PR c++/105067 +// { dg-do compile { target c++20 } } + +template +template +concept C = true; // { dg-error "parameter list" } -- 2.35.1.677.gabf474a5dd