From patchwork Mon Mar 7 12:04:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Sayle X-Patchwork-Id: 51612 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 E3293385800D for ; Mon, 7 Mar 2022 12:04:26 +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 686FE3858D35 for ; Mon, 7 Mar 2022 12:04:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 686FE3858D35 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=ay75UaFxoP8AtbGSxFNfNfdZM3pxuRrP6LXzbc2TugI=; b=n/zZpPWCME35al2QmkN0gE3tRZ akyT2aorMhBX6IZPTqgSJxOb/1w1zwf++jUwmRcH4jFUdJhm2vkgGq2O8gOxAJvWR9WjyjG8jae/W 46EhmBCSsV952bTtUAPs6+xNwJFgDatQyKvFcsWg1pwpZf8Bcibn+pb5JCswslFDaedjNv8wL0E2d eMQtpJCPtZt6AXxsM+QhQdQqPVvB7s+CaXeyI/hAGsJGepuT0tID624BGAfMCOq/HVM6L7HWX4SWe 7ZVRytrr5PvYi3NeD6HeEVjzuiM6jbP2T4TwEIMY+hkRpDHuV2fecv6ROClBEP/zdlZGXDfJ0G+nX E3aAUHGA==; Received: from host86-186-213-42.range86-186.btcentralplus.com ([86.186.213.42]:54302 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 1nRC5u-0004fP-LZ for gcc-patches@gcc.gnu.org; Mon, 07 Mar 2022 07:04:06 -0500 From: "Roger Sayle" To: Subject: [C++ PATCH] PR c++/96329: ICE-on-invalid-code error recovery. Date: Mon, 7 Mar 2022 12:04:03 -0000 Message-ID: <000601d8321b$716d1670$54474350$@nextmovesoftware.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdgyGzEUH4ct4UMqTl2SzjDpLXYs7w== 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.4 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++/96329 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++/96329 * parser.cc (cp_parser_linkage_specification): Treat the case where linkage is error_mark_node as "invalid linkage-specification". gcc/testsuite/ChangeLog PR c++/96329 * g++.dg/pr96329.C: New test case. Thanks in advance, Roger diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 03d99ab..d2993c7 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -16148,8 +16148,9 @@ cp_parser_linkage_specification (cp_parser* parser, tree prefix_attr) /* Transform the literal into an identifier. If the literal is a wide-character string, or contains embedded NULs, then we can't handle it as the user wants. */ - if (strlen (TREE_STRING_POINTER (linkage)) - != (size_t) (TREE_STRING_LENGTH (linkage) - 1)) + if (linkage == error_mark_node + || strlen (TREE_STRING_POINTER (linkage)) + != (size_t) (TREE_STRING_LENGTH (linkage) - 1)) { cp_parser_error (parser, "invalid linkage-specification"); /* Assume C++ linkage. */ diff --git a/gcc/testsuite/g++.dg/pr96329.C b/gcc/testsuite/g++.dg/pr96329.C new file mode 100644 index 0000000..c9f44b7 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr96329.C @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ +/* { dg-excess-errors "" } */ + +extern "C" ""a