From patchwork Tue Feb 6 03:11:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1895488 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=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=B75t2RF3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4TTSwF11hRz23gb for ; Tue, 6 Feb 2024 14:12:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1421D3858C2F for ; Tue, 6 Feb 2024 03:12:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 69DCF3858D33 for ; Tue, 6 Feb 2024 03:11:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 69DCF3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 69DCF3858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707189112; cv=none; b=UpSyVoYDaoFmL1/vnoiQB5TIloiEjC/XZw8xvrI/cSOo7hxctkZa2EfGSUCojHZtoln+55xsb1c/zqQhAEsqvFwC3nFHL8qcks4CLgx9fB/TFZTZ2ooXe1ntT2CrmK+qtAl7x5Ht3VhMarEbbsHsb57azoOxhZ2EpF8Ylhu2DTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707189112; c=relaxed/simple; bh=Sun/d+k9bhVWEo9WwYYwl4mxyO56P46vJDvooY/zpMM=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=wyu4Lnfqg3ws6KyMZOhmTw7hrla/XltXhvbupEN5yIhZgG/5I2dUXCbl9kkdOJGTVLMeq4V/APIAkX0YFbzJ9wLqmFJT/tc3YKot0akzkKRDDSJfN5VvTnaQGxVzT1SRiHKkzuRHjh+QmnHfCp9QgczIE2I+Izgcb62JG8UXc/g= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707189109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Xtr9YJYKV2Vh+fL3bbTF9YdTYvfcNQUKFOOnlY+eS0U=; b=B75t2RF3byXbIi+pCK4dmEwOqBJjBBCxkG4qV20qa3UOIBdFXSTqPNjMxx2fX1vA6S3DuK aVphBp49RfU/cuTwTAZTR535Q5xvqZ1Wn+sAsowaG07hioVW0WwTfDXEn8iRAE3j1GTnDj D4lZx6kIqXYOOOa7t5WC38lT4FyG0SI= Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-318-n82PpSI8Nhi5jUnKFwg3dg-1; Mon, 05 Feb 2024 22:11:47 -0500 X-MC-Unique: n82PpSI8Nhi5jUnKFwg3dg-1 Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-7ce706ba435so2603276241.2 for ; Mon, 05 Feb 2024 19:11:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707189106; x=1707793906; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xtr9YJYKV2Vh+fL3bbTF9YdTYvfcNQUKFOOnlY+eS0U=; b=mcl1yoVIoRUDHIxb4waI+yqjEs355cX+bdZu5Mldpknc+zTQN9Gh/J6ntbV5yatyaA cY0EJSX8OODH7vRpFhVXUAs2kDL3uEFiYmcEZYVUQphxlQwMJLdYP62BnR2RwJ+W9jBU S363IUyLcMYRNMKBWEc+XP9l7kuQv4rMBRK2BIyWN1pWhlXEqZ7pMgxwjJ+ItxNX8fRG ENtt5hKD6Akq1wCLyF1ToIt7LhItmPCe00dhgzecwzLDCOcY1Wjxr3xW0COyU6LFuPeK L/wiAOBecDYr/vY+y7DgqQCITuz6tb/lfBaz4zXP3ry/bDgRRyKrHq9oR/po8DrUdteo VJJA== X-Gm-Message-State: AOJu0Yxg7pySImVp0XLmNIbx1abFpFWIDbIxS+yyu9KH2cKIi+PiZ3FX BpQVh9t8XXAswCj0qr9dNyDzwJ7zMixPANqiipk6dRMAUVTqibuZ1xJtpVwdHu9CpRDck/sksIh ZgZi2SvJahoZMnYfpqEz3CQlZQ94oMVpwbO/3CAhs8KrMLrs9ImLrAKI7A6YKDEw= X-Received: by 2002:a05:6102:cd2:b0:46d:2339:e7c0 with SMTP id g18-20020a0561020cd200b0046d2339e7c0mr2406910vst.16.1707189106261; Mon, 05 Feb 2024 19:11:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFX5+SA694OARWCcZpFDxuolWJhFkS006eZilOzqd/XH85ExWwIpldstQkWAJFkDdV5OoAnHQ== X-Received: by 2002:a05:6102:cd2:b0:46d:2339:e7c0 with SMTP id g18-20020a0561020cd200b0046d2339e7c0mr2406901vst.16.1707189105796; Mon, 05 Feb 2024 19:11:45 -0800 (PST) Received: from redhat.com (2603-7000-9500-34a5-0000-0000-0000-1db4.res6.spectrum.com. [2603:7000:9500:34a5::1db4]) by smtp.gmail.com with ESMTPSA id jh15-20020a0562141fcf00b006818a1e269csm599421qvb.102.2024.02.05.19.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 19:11:45 -0800 (PST) Date: Mon, 5 Feb 2024 22:11:43 -0500 From: Marek Polacek To: Jason Merrill Cc: GCC Patches Subject: [PATCH v2] c++: DR2237, cdtor and template-id tweaks [PR107126] Message-ID: References: <20240203152404.1199437-1-polacek@redhat.com> <69077fcc-97fe-43be-9e34-9d91d1a7c7af@redhat.com> MIME-Version: 1.0 In-Reply-To: <69077fcc-97fe-43be-9e34-9d91d1a7c7af@redhat.com> User-Agent: Mutt/2.2.12 (2023-09-09) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 On Mon, Feb 05, 2024 at 10:14:34AM -0500, Jason Merrill wrote: > On 2/3/24 10:24, Marek Polacek wrote: > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? > > > > I'm not certain OPT_Wc__20_extensions is the best thing for something > > from [diff.cpp17]; would you prefer something else? > > I think it wants its own flag, that is enabled in C++20 or by > -Wc++20-compat. That seems best. I called it -Wdeprecated-template-id-cdtor. > > + if (cxx_dialect >= cxx20) > > + { > > + if (!cp_parser_simulate_error (parser)) > > + pedwarn (tilde_loc, OPT_Wc__20_extensions, > > + "template-id not allowed for destructor"); > > + return error_mark_node; > > + } > > + warning_at (tilde_loc, OPT_Wc__20_compat, > > + "template-id not allowed for destructor in C++20"); > > After a pedwarn we should accept the code, not return error_mark_node. /facepalm, yes. > I'm also concerned about pedwarn/warnings not guarded by > !cp_parser_uncommited_to_tentative_parse; that often leads to warning about > a tentative parse as a declaration that is eventually abandoned in favor of > a perfectly fine parse as an expression. Done. > It would be good for cp_parser_context to add a vec of warnings to emit at > cp_parser_parse_definitely time, and then > cp_parser_pedwarn/cp_parser_warning to fill it... That would be nice; I don't think we can fix bugs like PR61259 otherwise. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- Since my r11-532 changes to implement DR2237, for this test: template struct S { S(); }; in C++20 we emit the ugly: q.C:3:8: error: expected unqualified-id before ')' token 3 | S(); which doesn't explain what the problem is. This patch improves that diagnostic, reduces the error to a pedwarn, and adds a -Wc++20-compat diagnostic. We now say: q.C:3:7: warning: template-id not allowed for constructor in C++20 [-Wdeprecated-template-id-cdtor] 3 | S(); q.C:3:7: note: remove the '< >' This patch does *not* fix where the C++20 diagnostic is missing altogether. -Wc++20-compat triggered in libitm/; I sent a patch for that. DR 2237 PR c++/107126 PR c++/97202 gcc/c-family/ChangeLog: * c-opts.cc (c_common_post_options): In C++20 or with -Wc++20-compat, turn on -Wdeprecated-template-id-cdtor. * c.opt (Wdeprecated-template-id-cdtor): New. gcc/cp/ChangeLog: * parser.cc (cp_parser_unqualified_id): Downgrade the DR2237 error to a pedwarn. (cp_parser_constructor_declarator_p): Likewise. gcc/ChangeLog: * doc/invoke.texi: Document -Wdeprecated-template-id-cdtor. gcc/testsuite/ChangeLog: * g++.dg/DRs/dr2237.C: Adjust dg-error. * g++.dg/parse/constructor2.C: Likewise. * g++.dg/template/error34.C: Likewise. * g++.old-deja/g++.pt/ctor2.C: Likewise. * g++.dg/DRs/dr2237-2.C: New test. * g++.dg/DRs/dr2237-3.C: New test. * g++.dg/DRs/dr2237-4.C: New test. * g++.dg/warn/Wdeprecated-template-id-cdtor-1.C: New test. * g++.dg/warn/Wdeprecated-template-id-cdtor-2.C: New test. * g++.dg/warn/Wdeprecated-template-id-cdtor-3.C: New test. * g++.dg/warn/Wdeprecated-template-id-cdtor-4.C: New test. --- gcc/c-family/c-opts.cc | 5 +++ gcc/c-family/c.opt | 4 +++ gcc/cp/parser.cc | 34 ++++++++++++++----- gcc/doc/invoke.texi | 18 ++++++++++ gcc/testsuite/g++.dg/DRs/dr2237-2.C | 9 +++++ gcc/testsuite/g++.dg/DRs/dr2237-3.C | 16 +++++++++ gcc/testsuite/g++.dg/DRs/dr2237-4.C | 11 ++++++ gcc/testsuite/g++.dg/DRs/dr2237.C | 2 +- gcc/testsuite/g++.dg/parse/constructor2.C | 16 ++++----- gcc/testsuite/g++.dg/template/error34.C | 10 +++--- .../warn/Wdeprecated-template-id-cdtor-1.C | 9 +++++ .../warn/Wdeprecated-template-id-cdtor-2.C | 9 +++++ .../warn/Wdeprecated-template-id-cdtor-3.C | 9 +++++ .../warn/Wdeprecated-template-id-cdtor-4.C | 9 +++++ gcc/testsuite/g++.old-deja/g++.pt/ctor2.C | 2 +- 15 files changed, 140 insertions(+), 23 deletions(-) create mode 100644 gcc/testsuite/g++.dg/DRs/dr2237-2.C create mode 100644 gcc/testsuite/g++.dg/DRs/dr2237-3.C create mode 100644 gcc/testsuite/g++.dg/DRs/dr2237-4.C create mode 100644 gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-1.C create mode 100644 gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-2.C create mode 100644 gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-3.C create mode 100644 gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-4.C base-commit: c5d34912ad576be1ef19be92f7eabde54b9089eb diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc index b845aff2226..d2358e2009a 100644 --- a/gcc/c-family/c-opts.cc +++ b/gcc/c-family/c-opts.cc @@ -998,6 +998,11 @@ c_common_post_options (const char **pfilename) warn_deprecated_enum_float_conv, cxx_dialect >= cxx20 && warn_deprecated); + /* -Wdeprecated-template-id-cdtor is enabled by default in C++20. */ + SET_OPTION_IF_UNSET (&global_options, &global_options_set, + warn_deprecated_template_id_cdtor, + cxx_dialect >= cxx20 || warn_cxx20_compat); + /* Declone C++ 'structors if -Os. */ if (flag_declone_ctor_dtor == -1) flag_declone_ctor_dtor = optimize_size; diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 9c0a28092fc..2e1d07b66de 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -642,6 +642,10 @@ C++ ObjC++ Var(warn_deprecated_enum_float_conv) Warning Warn about deprecated arithmetic conversions on operands where one is of enumeration type and the other is of a floating-point type. +Wdeprecated-template-id-cdtor +C++ ObjC++ Var(warn_deprecated_template_id_cdtor) Warning +Warn about deprecated simple-template-id in a constructor or destructor. + Wdesignated-init C ObjC Var(warn_designated_init) Init(1) Warning Warn about positional initialization of structs requiring designated initializers. diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 3748ccd49ff..473eaf4f1f7 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -6717,12 +6717,17 @@ cp_parser_unqualified_id (cp_parser* parser, /* DR 2237 (C++20 only): A simple-template-id is no longer valid as the declarator-id of a constructor or destructor. */ - if (token->type == CPP_TEMPLATE_ID && declarator_p - && cxx_dialect >= cxx20) + if (token->type == CPP_TEMPLATE_ID + && declarator_p + && !cp_parser_uncommitted_to_tentative_parse_p (parser) + && !cp_parser_simulate_error (parser)) { - if (!cp_parser_simulate_error (parser)) - error_at (tilde_loc, "template-id not allowed for destructor"); - return error_mark_node; + auto_diagnostic_group d; + if (emit_diagnostic (cxx_dialect >= cxx20 ? DK_PEDWARN : DK_WARNING, + tilde_loc, OPT_Wdeprecated_template_id_cdtor, + "template-id not allowed for destructor in " + "C++20")) + inform (tilde_loc, "remove the %qs", "< >"); } /* If there was an explicit qualification (S::~T), first look @@ -32329,11 +32334,11 @@ cp_parser_constructor_declarator_p (cp_parser *parser, cp_parser_flags flags, if (next_token->type != CPP_NAME && next_token->type != CPP_SCOPE && next_token->type != CPP_NESTED_NAME_SPECIFIER - /* DR 2237 (C++20 only): A simple-template-id is no longer valid as the - declarator-id of a constructor or destructor. */ - && (next_token->type != CPP_TEMPLATE_ID || cxx_dialect >= cxx20)) + && next_token->type != CPP_TEMPLATE_ID) return false; + const bool saw_template_id = (next_token->type == CPP_TEMPLATE_ID); + /* Parse tentatively; we are going to roll back all of the tokens consumed here. */ cp_parser_parse_tentatively (parser); @@ -32550,6 +32555,19 @@ cp_parser_constructor_declarator_p (cp_parser *parser, cp_parser_flags flags, /* We did not really want to consume any tokens. */ cp_parser_abort_tentative_parse (parser); + /* DR 2237 (C++20 only): A simple-template-id is no longer valid as the + declarator-id of a constructor or destructor. */ + if (constructor_p + && saw_template_id + && !cp_parser_uncommitted_to_tentative_parse_p (parser)) + { + auto_diagnostic_group d; + if (emit_diagnostic (cxx_dialect >= cxx20 ? DK_PEDWARN : DK_WARNING, + input_location, OPT_Wdeprecated_template_id_cdtor, + "template-id not allowed for constructor in C++20")) + inform (input_location, "remove the %qs", "< >"); + } + return constructor_p; } diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 71339b8b30f..5bd65bd02be 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -255,6 +255,7 @@ in the following sections. -Wdelete-non-virtual-dtor -Wno-deprecated-array-compare -Wdeprecated-copy -Wdeprecated-copy-dtor -Wno-deprecated-enum-enum-conversion -Wno-deprecated-enum-float-conversion +-Wno-deprecated-template-id-cdtor -Weffc++ -Wno-elaborated-enum-base -Wno-exceptions -Wextra-semi -Wno-inaccessible-base -Wno-inherited-variadic-ctor -Wno-init-list-lifetime @@ -3989,6 +3990,23 @@ bool b = e <= 3.7; @option{-std=c++20}. In pre-C++20 dialects, this warning can be enabled by @option{-Wenum-conversion}. +@opindex Wdeprecated-template-id-cdtor +@opindex Wno-deprecated-template-id-cdtor +@item -Wno-deprecated-template-id-cdtor @r{(C++ and Objective-C++ only)} +Disable the warning about the deprecated use of simple-template-id as the +declarator-id of a constructor or destructor, which became invalid in C++20 +via DR 2237. For example: + +@smallexample +template struct S @{ + S(); // should be S(); + ~S(); // should be ~S(); +@}; +@end smallexample + +@option{-Wdeprecated-template-id-cdtor} is enabled by default with +@option{-std=c++20}; it is also enabled by @option{-Wc++20-compat}. + @opindex Welaborated-enum-base @opindex Wno-elaborated-enum-base @item -Wno-elaborated-enum-base diff --git a/gcc/testsuite/g++.dg/DRs/dr2237-2.C b/gcc/testsuite/g++.dg/DRs/dr2237-2.C new file mode 100644 index 00000000000..1d99347229c --- /dev/null +++ b/gcc/testsuite/g++.dg/DRs/dr2237-2.C @@ -0,0 +1,9 @@ +// DR 2237 - Can a template-id name a constructor? +// { dg-options "" } + +template +struct X { + X(); // { dg-warning "template-id not allowed for constructor" "" { target c++20 } } + X(int); // OK, injected-class-name used + ~X(); // { dg-warning "template-id not allowed for destructor" "" { target c++20 } } +}; diff --git a/gcc/testsuite/g++.dg/DRs/dr2237-3.C b/gcc/testsuite/g++.dg/DRs/dr2237-3.C new file mode 100644 index 00000000000..c8ad6852389 --- /dev/null +++ b/gcc/testsuite/g++.dg/DRs/dr2237-3.C @@ -0,0 +1,16 @@ +// PR c++/107126 +// { dg-options "" } + +template +struct C +{ + ~C(); +}; +template +C::~C() // { dg-warning "template-id not allowed for destructor" "" { target c++20 } } +{ +} +int main() +{ + C c;; +} diff --git a/gcc/testsuite/g++.dg/DRs/dr2237-4.C b/gcc/testsuite/g++.dg/DRs/dr2237-4.C new file mode 100644 index 00000000000..a358dd521b5 --- /dev/null +++ b/gcc/testsuite/g++.dg/DRs/dr2237-4.C @@ -0,0 +1,11 @@ +// PR c++/97202 +// { dg-options "" } + +template +struct F +{ + F(); // { dg-warning "template-id not allowed for constructor" "" { target c++20 } } +}; + +template +inline F::F() { } diff --git a/gcc/testsuite/g++.dg/DRs/dr2237.C b/gcc/testsuite/g++.dg/DRs/dr2237.C index f3d6d11e61e..830c8f5a2a6 100644 --- a/gcc/testsuite/g++.dg/DRs/dr2237.C +++ b/gcc/testsuite/g++.dg/DRs/dr2237.C @@ -2,7 +2,7 @@ template struct X { - X(); // { dg-error "expected" "" { target c++20 } } + X(); // { dg-error "template-id not allowed for constructor" "" { target c++20 } } X(int); // OK, injected-class-name used ~X(); // { dg-error "template-id not allowed for destructor" "" { target c++20 } } }; diff --git a/gcc/testsuite/g++.dg/parse/constructor2.C b/gcc/testsuite/g++.dg/parse/constructor2.C index d620f41e027..e4b2ad3f2fe 100644 --- a/gcc/testsuite/g++.dg/parse/constructor2.C +++ b/gcc/testsuite/g++.dg/parse/constructor2.C @@ -1,11 +1,11 @@ // PR c++/14260 -template -class T -{ -public: - T(short,short f=0) {} - T(int f) {} // { dg-error "expected" "" { target c++20 } } - T(int f=0,const char* b=0) {} // { dg-error "expected" "" { target c++20 } } -}; +template +class T +{ +public: + T(short,short f=0) {} + T(int f) {} // { dg-error "template-id not allowed for constructor" "" { target c++20 } } + T(int f=0,const char* b=0) {} // { dg-error "template-id not allowed for constructor" "" { target c++20 } } +}; diff --git a/gcc/testsuite/g++.dg/template/error34.C b/gcc/testsuite/g++.dg/template/error34.C index ab688d9ba8c..921cb8fb729 100644 --- a/gcc/testsuite/g++.dg/template/error34.C +++ b/gcc/testsuite/g++.dg/template/error34.C @@ -3,27 +3,27 @@ template struct A { - A<__builtin_offsetof(T, x)>(); // { dg-error "type/value mismatch|offsetof\\(T, x\\)|expected" } + A<__builtin_offsetof(T, x)>(); // { dg-error "type/value mismatch|offsetof\\(T, x\\)|template-id" } }; template struct B { - B<__builtin_offsetof(T, x.y)>(); // { dg-error "type/value mismatch|offsetof\\(T, x.y\\)|expected" } + B<__builtin_offsetof(T, x.y)>(); // { dg-error "type/value mismatch|offsetof\\(T, x.y\\)|template-id" } }; template struct C { - C<__builtin_offsetof(T, x[6])>(); // { dg-error "type/value mismatch|offsetof\\(T, x\\\[6\\\]\\)|expected" } + C<__builtin_offsetof(T, x[6])>(); // { dg-error "type/value mismatch|offsetof\\(T, x\\\[6\\\]\\)|template-id" } }; template struct D { - D<__builtin_offsetof(T, x.y[6].z)>(); // { dg-error "type/value mismatch|offsetof\\(T, x.y\\\[6\\\].z\\)|expected" } + D<__builtin_offsetof(T, x.y[6].z)>(); // { dg-error "type/value mismatch|offsetof\\(T, x.y\\\[6\\\].z\\)|template-id" } }; struct E { int x; }; template struct F { - F<__builtin_offsetof(E, x)>(); // { dg-error "type/value mismatch|offsetof\\(E, x\\)|expected" } + F<__builtin_offsetof(E, x)>(); // { dg-error "type/value mismatch|offsetof\\(E, x\\)|template-id" } }; diff --git a/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-1.C b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-1.C new file mode 100644 index 00000000000..429490708bc --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-1.C @@ -0,0 +1,9 @@ +// PR c++/107126 +// { dg-do compile } +// { dg-options "-Wc++20-compat" } + +template +struct X { + X(); // { dg-warning "template-id not allowed for constructor" } + ~X(); // { dg-warning "template-id not allowed for destructor" } +}; diff --git a/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-2.C b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-2.C new file mode 100644 index 00000000000..d76b647c615 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-2.C @@ -0,0 +1,9 @@ +// PR c++/107126 +// { dg-do compile } +// { dg-options "-Wdeprecated-template-id-cdtor" } + +template +struct X { + X(); // { dg-warning "template-id not allowed for constructor" } + ~X(); // { dg-warning "template-id not allowed for destructor" } +}; diff --git a/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-3.C b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-3.C new file mode 100644 index 00000000000..80fc2ff7739 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-3.C @@ -0,0 +1,9 @@ +// PR c++/107126 +// { dg-do compile } +// { dg-options "-Wc++20-compat -Wno-deprecated-template-id-cdtor" } + +template +struct X { + X(); // { dg-bogus "template-id not allowed for constructor" } + ~X(); // { dg-bogus "template-id not allowed for destructor" } +}; diff --git a/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-4.C b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-4.C new file mode 100644 index 00000000000..6f1747701da --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wdeprecated-template-id-cdtor-4.C @@ -0,0 +1,9 @@ +// PR c++/107126 +// { dg-do compile } +// { dg-options "-Wdeprecated-template-id-cdtor -Wno-c++20-compat" } + +template +struct X { + X(); // { dg-warning "template-id not allowed for constructor" } + ~X(); // { dg-warning "template-id not allowed for destructor" } +}; diff --git a/gcc/testsuite/g++.old-deja/g++.pt/ctor2.C b/gcc/testsuite/g++.old-deja/g++.pt/ctor2.C index bf418ba48c7..56b4232d04b 100644 --- a/gcc/testsuite/g++.old-deja/g++.pt/ctor2.C +++ b/gcc/testsuite/g++.old-deja/g++.pt/ctor2.C @@ -4,7 +4,7 @@ template struct A { - A(); // { dg-error "expected" "" { target c++20 } } + A(); // { dg-error "template-id" "" { target c++20 } } }; template