From patchwork Mon Mar 7 12:55:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Sayle X-Patchwork-Id: 51614 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2C17E385803A for ; Mon, 7 Mar 2022 12:55:39 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from server.nextmovesoftware.com (server.nextmovesoftware.com [162.254.253.69]) by sourceware.org (Postfix) with ESMTPS id 35EA03858D35 for ; Mon, 7 Mar 2022 12:55:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 35EA03858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=nextmovesoftware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nextmovesoftware.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nextmovesoftware.com; s=default; h=Content-Type:MIME-Version:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bm/FUxFpu5fcAmG0lO3WHOkcCAvdve8fsiSdfA9LgfU=; b=ScS6zo9wbR485nJE0aZOPMT715 V5hGcl6/4KG5MHEoeXJLc6XpcDCTdQJAxOYCYaWzLF5+i/yEvrahzv3LUDMPSnJ84XwQRRzfgLQJ7 URojsysP0YIUE4saVBMdjPpmE+pycDmxN9RnVbmUGJ7BcuRfeRfhSbffUyeHUBasUSHuD+XflWqwH rrQc/CiKwbclAnSaFWHTxfOPGs3y93sVslpO2GNpGYdMPdAVtq+Q83GxGkwJ3o9EfTRVxPx/Gtn0L Lu2n+oE+dz+jYCviWgWrSgaysceLo8WfjIfdF4Pfdr6bPgcqBqfyAE0VSqS+l4HJ7GAz3Sc0W35Ud P2nc1olQ==; Received: from host86-186-213-42.range86-186.btcentralplus.com ([86.186.213.42]:54472 helo=Dell) by server.nextmovesoftware.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nRCtW-00074C-Jo for gcc-patches@gcc.gnu.org; Mon, 07 Mar 2022 07:55:22 -0500 From: "Roger Sayle" To: Subject: [C++ PATCH] PR c++/96440: ICE-on-invalid-code error recovery. Date: Mon, 7 Mar 2022 12:55:20 -0000 Message-ID: <005e01d83222$9b812a80$d2837f80$@nextmovesoftware.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdgyIkz8PEq86ljDTG6JjSVq5HZNsg== Content-Language: en-gb X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server.nextmovesoftware.com X-AntiAbuse: Original Domain - gcc.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - nextmovesoftware.com X-Get-Message-Sender-Via: server.nextmovesoftware.com: authenticated_id: roger@nextmovesoftware.com X-Authenticated-Sender: server.nextmovesoftware.com: roger@nextmovesoftware.com X-Source: X-Source-Args: X-Source-Dir: X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This patch fixes PR c++/96440 which is an ICE-on-invalid-code regression affecting mainline. This patch has been tested on x86_64-pc-linux-gnu, enabling languages c and c++, with make bootstrap and make -k check with no new failures. Ok for mainline? 2022-03-07 Roger Sayle gcc/cp/ChangeLog PR c++/96440 * decl.cc (start_decl): Defend against prefix_attributes being error_mark_node. gcc/testsuite/ChangeLog PR c++/96440 * g++.dg/pr96440.C: New test case. Roger diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 7f80f9d..de41b4d 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -5483,13 +5483,15 @@ start_decl (const cp_declarator *declarator, *pushed_scope_p = NULL_TREE; - attributes = chainon (attributes, prefix_attributes); + if (prefix_attributes != error_mark_node) + attributes = chainon (attributes, prefix_attributes); decl = grokdeclarator (declarator, declspecs, NORMAL, initialized, &attributes); if (decl == NULL_TREE || VOID_TYPE_P (decl) - || decl == error_mark_node) + || decl == error_mark_node + || prefix_attributes == error_mark_node) return error_mark_node; context = CP_DECL_CONTEXT (decl); diff --git a/gcc/testsuite/g++.dg/pr96440.C b/gcc/testsuite/g++.dg/pr96440.C new file mode 100644 index 0000000..212271f --- /dev/null +++ b/gcc/testsuite/g++.dg/pr96440.C @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ +/* { dg-excess-errors "" } */ + +auto alignas a [[]] [[const]] ();