From patchwork Fri Jun 7 12:12:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Martin X-Patchwork-Id: 1945080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nasilyan.com header.i=@nasilyan.com header.a=rsa-sha256 header.s=xce2voaxvxhmx73p47whqmbxwwvd7qkl header.b=PYaCL8FV; dkim=pass (1024-bit key; unprotected) header.d=amazonses.com header.i=@amazonses.com header.a=rsa-sha256 header.s=uku4taia5b5tsbglxyj6zym32efj7xqv header.b=PwWqU7rG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwg8J6612z20QJ for ; Fri, 7 Jun 2024 22:13:20 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B6CA39CC28E for ; Fri, 7 Jun 2024 12:13:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from a2-8.smtp-out.eu-west-1.amazonses.com (a2-8.smtp-out.eu-west-1.amazonses.com [54.240.2.8]) by sourceware.org (Postfix) with ESMTPS id A591339CC280 for ; Fri, 7 Jun 2024 12:12:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A591339CC280 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=nasilyan.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eu-west-1.amazonses.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A591339CC280 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.240.2.8 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717762376; cv=none; b=NSee47dQoDwrGT9pzNbLQNktqDdLMgiA8iei3qL+tHrjgGJU9mMQYYh3Lw2loiLg++5HolwOo11DYyBe/1GillIqpN9lLJiLq4uPzYtQKvXkzqr1d451Y8hPI50cyD3ixhVSMahpZS1HCpZOkw4vJJFqaV+Rh3Cm2/d0BgeVtGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717762376; c=relaxed/simple; bh=ueM0Q6lm07xPlwTerDKlCTrc6Qy8cFiIiARQvzFlpys=; h=DKIM-Signature:DKIM-Signature:Subject:From:To:Date:Mime-Version: Message-ID; b=Qx3iaWsQXOhAyunreJ+CEw043sJuQeUrAe0ITgOidcV2mOKVGZnbN/hLrc5nUGjvZ+/dXwFiSltPvtoFzSlv4m/I4r0hrTjjIdpuoVMKlBJLQ3hKaphp1vX9ush7hl9c8hMhtB/Ylt+oAW09vW1414lJkjgFMvIni4WQ+wCbDT8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=xce2voaxvxhmx73p47whqmbxwwvd7qkl; d=nasilyan.com; t=1717762373; h=Subject:From:To:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=ueM0Q6lm07xPlwTerDKlCTrc6Qy8cFiIiARQvzFlpys=; b=PYaCL8FVPfb5lgoe/WX2jcQbyaZBcQluhFxqH7MsFeonGnDNa2y9JlqAIjpA7cwF jazS6QZt/X62b3Xdc3I67I/Itp4GeoO2RFMGvk5ukSfIaFP2Qqdz/1zhmDq8OzNsATK clvzLb4MVVnD0GPsdSpS6auOl3IQDZcXa2HFXMyA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1717762373; h=Subject:From:To:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=ueM0Q6lm07xPlwTerDKlCTrc6Qy8cFiIiARQvzFlpys=; b=PwWqU7rGZUXYEsrSl69Io6IKg4pStxsyzvOZydOqoRwKEK7O1brjzAOXKsMFYVaG X0L54yuN0lz2S4mXumIeglBNfcEoXG3i+237EFFKOmUd68c3OontYTz4t8gQZLL4cw7 ZK3GrbpFpXQAkv/Iiqspmj2eNAu5o8w0g/FhcVeU= Subject: [PATCH] c++: Make *_cast<*> parsing more robust to errors [PR108438] From: =?utf-8?q?Simon_Martin?= To: =?utf-8?q?gcc-patches=40gcc=2Egnu=2Eorg?= Date: Fri, 7 Jun 2024 12:12:52 +0000 Mime-Version: 1.0 References: <20240607121250.60045-1-simon@nasilyan.com> X-Mailer: Amazon WorkMail Thread-Index: AQHauNQEwBV25WxxTDyuz0RWS9k7RA== Thread-Topic: [PATCH] c++: Make *_cast<*> parsing more robust to errors [PR108438] X-Original-Mailer: git-send-email 2.44.0 X-Wm-Sent-Timestamp: 1717762371 Message-ID: <0102018ff29db4bf-c0839f10-7b1e-4d82-bcf1-a26f114611d5-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.06.07-54.240.2.8 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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+incoming=patchwork.ozlabs.org@gcc.gnu.org We ICE upon the following when trying to emit a -Wlogical-not-parentheses warning: === cut here === template T foo (T arg, T& ref, T* ptr) { int a = 1; return static_cast(a); } === cut here === This patch makes *_cast<*> parsing more robust by skipping to the closing '>' upon error in the target type. Successfully tested on x86_64-pc-linux-gnu. (Note that I have a patch pending review that also adds g++.dg/parse/crash74.C; I will obviously handle the name conflict at commit time) PR c++/108438 gcc/cp/ChangeLog: * parser.cc (cp_parser_postfix_expression): Skip to the closing '>' upon error parsing the target type of *_cast<*> expressions. gcc/testsuite/ChangeLog: * g++.dg/parse/crash74.C: New test. --- gcc/cp/parser.cc | 3 ++- gcc/testsuite/g++.dg/parse/crash74.C | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/crash74.C diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index bc4a2359153..3516c2aa38b 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -7569,7 +7569,8 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p, NULL); parser->in_type_id_in_expr_p = saved_in_type_id_in_expr_p; /* Look for the closing `>'. */ - cp_parser_require (parser, CPP_GREATER, RT_GREATER); + if (!cp_parser_require (parser, CPP_GREATER, RT_GREATER)) + cp_parser_skip_to_end_of_template_parameter_list (parser); /* Restore the old message. */ parser->type_definition_forbidden_message = saved_message; diff --git a/gcc/testsuite/g++.dg/parse/crash74.C b/gcc/testsuite/g++.dg/parse/crash74.C new file mode 100644 index 00000000000..81a16e35b14 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash74.C @@ -0,0 +1,9 @@ +// PR c++/108438 +// { dg-options "-Wlogical-not-parentheses" } + +template +T foo (T arg, T& ref, T* ptr) +{ + int a = 1; + return static_cast(a); // { dg-error "expected" } +}