From patchwork Wed Mar 10 03:22:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1450284 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=2620:52:3:1:0:246e:9693:128c; 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=Gh33hPW7; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4DwHTR3f3fz9sVS for ; Wed, 10 Mar 2021 14:23:07 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 86BD33857C73; Wed, 10 Mar 2021 03:22:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86BD33857C73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1615346579; bh=LXwq6JqHBpCet3pQNg/mAHUZ9eQvBuK1o8rQzpnHhr4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Gh33hPW7OX848V/bkIKQppH4AwNZ4ykEWvk2MtdGSZPCGXGdKApfN9rozRvIze7da aqTYc309AJdQe0WGsmFTgd2egNKr727HTBVV3/2Qfyjh+UCbzqScgZiM/nuWpZgSaf rhX6aCqrr/qlDPhz8471KXq08gLQU0HWuW2NXKlk= 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 B2B21385800D for ; Wed, 10 Mar 2021 03:22:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B2B21385800D 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-148-xeQE910GNTa0g9dFGVBSFA-1; Tue, 09 Mar 2021 22:22:55 -0500 X-MC-Unique: xeQE910GNTa0g9dFGVBSFA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E3F9800C78 for ; Wed, 10 Mar 2021 03:22:54 +0000 (UTC) Received: from pdp-11.hsd1.ma.comcast.net (ovpn-117-161.rdu2.redhat.com [10.10.117.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 472D419C59; Wed, 10 Mar 2021 03:22:54 +0000 (UTC) To: GCC Patches , Jason Merrill Subject: [PATCH] c++: Fix error-recovery with requires expression [PR99500] Date: Tue, 9 Mar 2021 22:22:45 -0500 Message-Id: <20210310032245.1266092-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.6 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 fixes an ICE on invalid code where one of the parameters was error_mark_node and thus resetting its DECL_CONTEXT crashed. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? gcc/cp/ChangeLog: PR c++/99500 * parser.c (cp_parser_requirement_parameter_list): Handle error_mark_node. gcc/testsuite/ChangeLog: PR c++/99500 * g++.dg/cpp2a/concepts-err3.C: New test. --- gcc/cp/parser.c | 7 +++++-- gcc/testsuite/g++.dg/cpp2a/concepts-err3.C | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-err3.C base-commit: 8dc225d311ed87633fa970164bdda19bf228b8a3 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 0a7d18af98b..dbc44ed0765 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -28835,8 +28835,11 @@ cp_parser_requirement_parameter_list (cp_parser *parser) if (parm == void_list_node || parm == explicit_void_list_node) break; tree decl = TREE_VALUE (parm); - DECL_CONTEXT (decl) = NULL_TREE; - CONSTRAINT_VAR_P (decl) = true; + if (decl != error_mark_node) + { + DECL_CONTEXT (decl) = NULL_TREE; + CONSTRAINT_VAR_P (decl) = true; + } } return parms; diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-err3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-err3.C new file mode 100644 index 00000000000..9427fd5c5a6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-err3.C @@ -0,0 +1,4 @@ +// PR c++/99500 +// { dg-do compile { target c++20 } } + +bool b = requires (bool a, int a) { requires true; }; // { dg-error "conflicting declaration" }