From patchwork Tue Feb 11 00:26:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 106314 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 899113858C35 for ; Tue, 11 Feb 2025 00:27:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 899113858C35 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=quicinc.com header.i=@quicinc.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=JDY6OA8v X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by sourceware.org (Postfix) with ESMTPS id 962EA3858CD9 for ; Tue, 11 Feb 2025 00:26:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 962EA3858CD9 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 962EA3858CD9 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739233581; cv=none; b=OdWrtJdEymmI4DfxjeqGbODMpMOSblmc0AWcNHLUb5kxIjkWiVD9HfPJjkxWuZk5LCRbwGBee0r7GIahnkYdr6r6nFirOOC3hGbf6DzIc2Zk4ARklHBBx3NrTb2OQKjwS7WIQNV/FaITNqqHzrhc7ALb2RPmiAARPRJcuBXARBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739233581; c=relaxed/simple; bh=nReUtziJ0eBZ3GZjc40BpeIzCG2CBE3lwsMMuDwBOnQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=G3UNLFqm6ArZwzxPYDE0EH0pad/aykUI5F+uNTBne/B290xB1cRt8jq0c5KGJs4Wz7CcQiHW9NTAFRs9IfxDhpsZuVauMV4bCjjYuycdTZ5HRYbD9LLdUD1ljBHCgcnQMocnt9QXphI+fqqgsQezzAjGKFB4n8XRPjw8B7e01jo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 962EA3858CD9 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51AJA7LV020687 for ; Tue, 11 Feb 2025 00:26:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=EqSZYfESgfEAuqGigzqDwc ZrbB8JuoPwWNfbTTaG0RU=; b=JDY6OA8vu0MZnVD4MYVG9i4jyAjvkSw/6Gm+4o b8oyNWkGLsnaKqX54nWAtkxZe8KXufaOEr2GWLo3mVf1rm4UyHNUzeO6Qd9iOnsH ka2e8CY9PKsZ8qDp+z7whS5/lIIgslZaho0n1GFovrJ6ZKIiA7bCyzQdkLkoAX7B kj3pTGWjCLAIOJILSrej7o8eiXjUy3D+kfyDAxDDwx3YNIXIkEhf1ZeDD4DU/lwH 65QyAOpxXwsCXXfig2gUv6+ChlKL01TCclGMm/wreRw6BZyaQgojL1xiTHGspKg7 fHBmha37S0beRAIcUCwFY7BO7MkU1X6qfSCh66h0IIXqHjCw== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44qe6ntb72-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Feb 2025 00:26:20 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 51B0QJdn029646 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Feb 2025 00:26:19 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Mon, 10 Feb 2025 16:26:19 -0800 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] c: Fix pragma inside a pragma [PR97991} Date: Mon, 10 Feb 2025 16:26:08 -0800 Message-ID: <20250211002608.4157034-1-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 3po2QeZCb_W7zr2M_PM28K9fMkpw7IDb X-Proofpoint-ORIG-GUID: 3po2QeZCb_W7zr2M_PM28K9fMkpw7IDb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-10_12,2025-02-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxscore=0 phishscore=0 mlxlogscore=479 impostorscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502100180 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 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 After r0-72806-gbc4071dd66fd4d, c_parser_consume_token will assert if we get a pragma inside c_parser_consume_token but pragma processing will call pragma_lex which then calls c_parser_consume_token. In the case of pragma with expansion (redefine_extname, message and sometimes pack [and some target specific pragmas]) we get the expanded tokens that includes CPP_PRAGMA. We should just allow it instead of doing an assert. This follows what the C++ front-end does even and we no longer have an ICE. Bootstrapped and tested on x86_64-linux-gnu. PR c/97991 gcc/c/ChangeLog: * c-parser.cc (c_parser_consume_token): Allow CPP_PRAGMA if inside a pragma. gcc/testsuite/ChangeLog: * c-c++-common/cpp/pr97991-1.c: New test. Signed-off-by: Andrew Pinski --- gcc/c/c-parser.cc | 6 +++++- gcc/testsuite/c-c++-common/cpp/pr97991-1.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/cpp/pr97991-1.c diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 106a5b48093..ff4a15aebce 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -929,7 +929,11 @@ c_parser_consume_token (c_parser *parser) gcc_assert (parser->tokens_avail >= 1); gcc_assert (parser->tokens[0].type != CPP_EOF); gcc_assert (!parser->in_pragma || parser->tokens[0].type != CPP_PRAGMA_EOL); - gcc_assert (parser->error || parser->tokens[0].type != CPP_PRAGMA); + /* CPP_PRAGMA should not show up here except if there was an error or inside + another pragma. */ + gcc_assert (parser->in_pragma + || parser->error + || parser->tokens[0].type != CPP_PRAGMA); parser->last_token_location = parser->tokens[0].location; if (parser->tokens != &parser->tokens_buf[0]) parser->tokens++; diff --git a/gcc/testsuite/c-c++-common/cpp/pr97991-1.c b/gcc/testsuite/c-c++-common/cpp/pr97991-1.c new file mode 100644 index 00000000000..afdfd8a51b2 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/pr97991-1.c @@ -0,0 +1,3 @@ +/* { dg-do compile } */ +/* Make sure malformed redefine_extname with a pragma inside does not cause an ICE. */ +#pragma redefine_extname _Pragma ("pack(bar)") /* { dg-warning "" } */