From patchwork Mon Apr 19 21:17:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1468124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Q2yeAGCL; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FPKRK71khz9vDc for ; Tue, 20 Apr 2021 07:18:05 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD76E3948A51; Mon, 19 Apr 2021 21:18:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD76E3948A51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1618867081; bh=NAZ0G72QeD47zcDYHC8sLyhDX3RdRRQwAmTN9CYivRU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Q2yeAGCLROQ/BXWisWPL8wxRvZHiylS25FMLunkXV7XNRCZdloOT9X6NoMbQ6X550 ji3UzhOj30gUdIbiZsku5imMrek2Ywf/7BjxWccXJKYs8UPy8JsQ8TUnuBDCSW3lDF pNihn2gaNzbX6XewEQcs/AjO2efKXqEwd0ButEcA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id E48763948A51 for ; Mon, 19 Apr 2021 21:17:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E48763948A51 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-JvJ0tffIME27CRtX1HSEUw-1; Mon, 19 Apr 2021 17:17:52 -0400 X-MC-Unique: JvJ0tffIME27CRtX1HSEUw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FCCA8030B5 for ; Mon, 19 Apr 2021 21:17:51 +0000 (UTC) Received: from pdp-11.redhat.com (ovpn-115-228.rdu2.redhat.com [10.10.115.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACF145D74B; Mon, 19 Apr 2021 21:17:50 +0000 (UTC) To: Jason Merrill , GCC Patches Subject: [PATCH] c++: ICE with concept defined in function [PR97536] Date: Mon, 19 Apr 2021 17:17:42 -0400 Message-Id: <20210419211742.288906-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.4 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Marek Polacek via Gcc-patches From: Marek Polacek Reply-To: Marek Polacek Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This is an ICE-on-invalid, but I keep seeing it when reducing code so I'd like to fix it. We crash on template void forward() { concept C = true; } which breaks two requirements: [temp.concept]/1: A concept is a template ... [temp.concept]/3: A concept-definition shall inhabit a namespace scope. This patch adds a test that exercises broken code and fixes the ICE by checking that a concept-definition is defined at namespace scope. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? gcc/cp/ChangeLog: PR c++/97536 * decl.c (grokvardecl): Given an error when a concept is not defined at namespace scope. gcc/testsuite/ChangeLog: PR c++/97536 * g++.dg/concepts/diagnostic16.C: New test. --- gcc/cp/decl.c | 6 +++ gcc/testsuite/g++.dg/concepts/diagnostic16.C | 45 ++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 gcc/testsuite/g++.dg/concepts/diagnostic16.C base-commit: 329d2f0df7d6d22c87ab3338b94caef68139cd58 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 942eb318f2c..b81de8ef934 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10365,6 +10365,12 @@ grokvardecl (tree type, "a non-template variable cannot be %"); return NULL_TREE; } + else if (!at_namespace_scope_p ()) + { + error_at (declspecs->locations[ds_concept], + "concept must be defined at namespace scope"); + return NULL_TREE; + } else DECL_DECLARED_CONCEPT_P (decl) = true; if (!same_type_ignoring_top_level_qualifiers_p (type, boolean_type_node)) diff --git a/gcc/testsuite/g++.dg/concepts/diagnostic16.C b/gcc/testsuite/g++.dg/concepts/diagnostic16.C new file mode 100644 index 00000000000..fcba535a876 --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/diagnostic16.C @@ -0,0 +1,45 @@ +// PR c++/97536 +// { dg-do compile { target concepts } } + +template +concept C1 = true; + +concept C2 = true; // { dg-error "non-template variable cannot be .concept." } +// { dg-error "concept definition syntax is" "" { target *-*-* } .-1 } + +template +void fn1 () +{ + concept bar = true; // { dg-error "concept must be defined at namespace scope" } +// { dg-error "concept definition syntax is" "" { target *-*-* } .-1 } +} + +void fn2 () +{ + concept bar = true; // { dg-error "non-template variable cannot be .concept." } +// { dg-error "concept definition syntax is" "" { target *-*-* } .-1 } +} + +template +void fn3 () +{ + template // { dg-error "template declaration cannot appear at block scope" } + concept bar = true; +} + +void fn4 () +{ + template // { dg-error "template declaration cannot appear at block scope" } + concept bar = true; +} + +void fn5 () +{ + C1 auto x = 42; +} + +template +void fn6 () +{ + C1 auto x = 42; +}