From patchwork Mon Aug 26 16:49:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Martin X-Patchwork-Id: 1976933 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=HCx6kKx4; dkim=pass (1024-bit key; unprotected) header.d=amazonses.com header.i=@amazonses.com header.a=rsa-sha256 header.s=uku4taia5b5tsbglxyj6zym32efj7xqv header.b=ja+zDp6h; 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 4WsxVm5HZfz1yXd for ; Tue, 27 Aug 2024 02:50:08 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 368FC385DC20 for ; Mon, 26 Aug 2024 16:50:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from a2-35.smtp-out.eu-west-1.amazonses.com (a2-35.smtp-out.eu-west-1.amazonses.com [54.240.2.35]) by sourceware.org (Postfix) with ESMTPS id 32DC63858D26 for ; Mon, 26 Aug 2024 16:49:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 32DC63858D26 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 32DC63858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.240.2.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724690985; cv=none; b=HDP5MPp24K75XZ74e6exZ25fS6mTfei1Jwy/Mx37hR1VDFKpHPG7vYk7mgMFXnMVGHMqDUWs0ExGxBuZGPPr7cSWhmu0eEc2tkqDh6csmzV/KF8DPBT2liuXcm2poDgK6A5nvoXx7zCFDw+l2zla2MR25r+4SWQw24jOrnOZe/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724690985; c=relaxed/simple; bh=gd6+kB20I1uWJ7e1Qdirwjl7PkOiDmQyQeox0onpKBM=; h=DKIM-Signature:DKIM-Signature:Subject:From:To:Date:Mime-Version: Message-ID; b=I1yLiA5dsjGoiPhwltopz0A1g4az0JZ/WQ29rP/1I/XukCCyXdVRNHeVs6Ij0JqaGqR6yRB76aqJnR1ZjjyORqjEiAChkZlnPj05JSAVTwX7bTGfSjBT2irfSI/VdE5x6Q1bjDDsWN2m2+LtorCB7KRBN/b4VLjHovtlRf0HMU8= 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=1724690981; h=Subject:From:To:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=gd6+kB20I1uWJ7e1Qdirwjl7PkOiDmQyQeox0onpKBM=; b=HCx6kKx4EownzJitZ5GNV43/rFM33KRhTNHVBUx76XLElP3Ss9mmfg7ClKR7H/Qy 5TCNMPFdnU3v/yrBsVPP5r/wUaS75e+6R8pbapux5JHc8YYBa/D6dMGn1nkc5qItg8D DAzEP1GW52HjEMwqkpuUKzv4ZepvOigkXa5t3BLE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1724690981; h=Subject:From:To:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=gd6+kB20I1uWJ7e1Qdirwjl7PkOiDmQyQeox0onpKBM=; b=ja+zDp6h05iFQ/eP2mpXfRtn37e+3YKDbncrFEbdMQqMycLCwGZ0z+3xEQRWXOiX FEBklV0y6TrePG0p6KB/FOjGLCf2rw5cGqcYfF7c9Kojf/nAOBJsj5cSTMJmIq0efiI SAGQNmX76PgFVHLbgEQ5pCvmyujSNTHAvhtBYAlo= Subject: [PATCH] c++: Don't show constructor internal name in error message [PR105483] From: =?utf-8?q?Simon_Martin?= To: =?utf-8?q?gcc-patches=40gcc=2Egnu=2Eorg?= Date: Mon, 26 Aug 2024 16:49:41 +0000 Mime-Version: 1.0 References: <20240826164937.46729-1-simon@nasilyan.com> X-Mailer: Amazon WorkMail Thread-Index: AQHa99fx1Si5xqHKRLOheBDyLqicag== Thread-Topic: [PATCH] c++: Don't show constructor internal name in error message [PR105483] X-Original-Mailer: git-send-email 2.44.0 X-Wm-Sent-Timestamp: 1724690980 Message-ID: <010201918f97e233-3b2c29a5-89f0-4cf6-8161-dded50bb5b00-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.08.26-54.240.2.35 X-Spam-Status: No, score=-13.2 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 mention 'X::__ct' instead of 'X::X' in the "names the constructor, not the type" error for this invalid code: === cut here === struct X {}; void g () { X::X x; } === cut here === The problem is that we use %<%T::%D%> to build the error message, while %qE does exactly what we need since we have DECL_CONSTRUCTOR_P. This is what this patch does, along with skipping until the end of the statement to avoid emitting extra (useless) errors. Successfully tested on x86_64-pc-linux-gnu. PR c++/105483 gcc/cp/ChangeLog: * parser.cc (cp_parser_expression_statement): Use %qE instead of incorrect %<%T::%D%>, and skip to end of statement. gcc/testsuite/ChangeLog: * g++.dg/tc1/dr147.C: Adjust test expectation. * g++.dg/diagnostic/pr105483.C: New test. --- gcc/cp/parser.cc | 7 ++++--- gcc/testsuite/g++.dg/diagnostic/pr105483.C | 7 +++++++ gcc/testsuite/g++.dg/tc1/dr147.C | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/diagnostic/pr105483.C diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 28ebf2beb60..ef4e3838a86 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -13240,10 +13240,11 @@ cp_parser_expression_statement (cp_parser* parser, tree in_statement_expr) && DECL_CONSTRUCTOR_P (get_first_fn (statement))) { /* A::A a; */ - tree fn = get_first_fn (statement); error_at (token->location, - "%<%T::%D%> names the constructor, not the type", - DECL_CONTEXT (fn), DECL_NAME (fn)); + "%qE names the constructor, not the type", + get_first_fn (statement)); + cp_parser_skip_to_end_of_block_or_statement (parser); + return error_mark_node; } } diff --git a/gcc/testsuite/g++.dg/diagnostic/pr105483.C b/gcc/testsuite/g++.dg/diagnostic/pr105483.C new file mode 100644 index 00000000000..b935bacea11 --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/pr105483.C @@ -0,0 +1,7 @@ +// PR c++/105483 +// { dg-do compile } + +struct X { }; +void g () { + X::X x; // { dg-error "'X::X' names the constructor" } +} diff --git a/gcc/testsuite/g++.dg/tc1/dr147.C b/gcc/testsuite/g++.dg/tc1/dr147.C index 6b656491e81..ced18d1879c 100644 --- a/gcc/testsuite/g++.dg/tc1/dr147.C +++ b/gcc/testsuite/g++.dg/tc1/dr147.C @@ -21,7 +21,7 @@ void A::f() void f() { A::A a; // { dg-error "constructor" "constructor" } -} // { dg-error "" "error cascade" { target *-*-* } .-1 } error cascade +} } namespace N2 {