From patchwork Fri Jan 12 07:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: waffl3x X-Patchwork-Id: 1885900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=protonmail.com header.i=@protonmail.com header.a=rsa-sha256 header.s=protonmail3 header.b=V5IoZRFM; 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 4TBD480FRlz1yP3 for ; Fri, 12 Jan 2024 18:41:11 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C11D03857BA1 for ; Fri, 12 Jan 2024 07:41:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) by sourceware.org (Postfix) with ESMTPS id 5EBC33858D33 for ; Fri, 12 Jan 2024 07:40:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5EBC33858D33 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=protonmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5EBC33858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=185.70.43.22 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705045245; cv=none; b=cRaMQBXdDxnBk6rvK8LTFvJdFa/HJwQtr4h4cHoFYUc3qVhn1B8LLenIRGRW8jdomckiwe21FZxADtpJZ0zTJ4anEuODL4ruwL3/q0efNOkp1LbxC/YGB9otedsEIM+xvK4gAA3J30EYx3JXZmd2Vux+eshebnGEGk6ZcA3vWRw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705045245; c=relaxed/simple; bh=9t9fvD2BdxLCMABlVr35SWFIlL/4Ev4RE2OuqCIobR4=; h=DKIM-Signature:Date:To:From:Subject:Message-ID:MIME-Version; b=Uz2b/3zrMyzl1UwNb/nYII/GHDNMTaQ+M/X7Sf3HrwmUNXxeMesWjV9SyuUSSwYB1gngXz9EpGB3mUz63GckN0ZObW5d+br60EBgSH6iXv7lV0ioeTkKbhn5+5lpLIwpcJ99pBAZgfhyfR8raNHPB7IB2dUpuRrZn38NB371uAM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1705045241; x=1705304441; bh=9t9fvD2BdxLCMABlVr35SWFIlL/4Ev4RE2OuqCIobR4=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=V5IoZRFM64mQqngDojGde47wP9hmrSSN+86WvETyrlVu6SyAM7TiBgPOXomgtiwy3 ajKfRv7o4V6N6Yo3ucq7bXrY+sC50PZEE2F8XLuonUzwMNXumvjd4dMP8SuVa1r6nw vY/JCKtjlqLhkOm0uxl6J7nS+p37K2W71Dc5Ii9SYIP+PJwx2Jg3l0PeQUsB55e1UN jwopHRX8ENY65Vf/4u8t8+NdCdqazwfzMCf78PD+VU60HH5jjTksvG+wGRxYH8Ar+h OJJXxmglo4aEu9P8tkSqS25cIl5Ea7hBSVSn99gR57MVCguUb0OUlUAwZIjcdWlcWg fpIOSPcH+Hmdg== Date: Fri, 12 Jan 2024 07:40:19 +0000 To: "gcc-patches@gcc.gnu.org" From: waffl3x Subject: [PATCH] c++: reject packs on xobj params. [PR113307] Message-ID: Feedback-ID: 14591686:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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 Bootstrapped and tested on x86_64-linux with no regressions. I'm still getting used to things so let me know if the change log entries are excessive, thanks. From 9dc168e7bcbbd7d515fa28cb9cae28ec113fae0f Mon Sep 17 00:00:00 2001 From: Waffl3x Date: Thu, 11 Jan 2024 14:32:46 -0700 Subject: [PATCH] c++: reject packs on xobj params. [PR113307] Reject and diagnose xobj parameters declared as parameter packs. PR c++/113307 gcc/cp/ChangeLog: * parser.cc (cp_parser_parameter_declaration): Reject packs on xobj params. gcc/testsuite/ChangeLog: * g++.dg/cpp23/explicit-obj-diagnostics3.C: Add test for rejection of packs. Signed-off-by: Waffl3x --- gcc/cp/parser.cc | 21 +++- .../g++.dg/cpp23/explicit-obj-diagnostics3.C | 106 +++++++++++++++++- 2 files changed, 125 insertions(+), 2 deletions(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 8ab98cc0c23..70fbba09bf8 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -25706,6 +25706,25 @@ cp_parser_parameter_declaration (cp_parser *parser, for a C-style variadic function. */ token = cp_lexer_peek_token (parser->lexer); + bool const xobj_param_p + = decl_spec_seq_has_spec_p (&decl_specifiers, ds_this); + + if (xobj_param_p + && ((declarator && declarator->parameter_pack_p) + || cp_lexer_next_token_is (parser->lexer, CPP_ELLIPSIS))) + { + location_t xobj_param + = make_location (decl_specifiers.locations[ds_this], + decl_spec_token_start->location, + input_location); + error_at(xobj_param, + "an explicit object parameter cannot " + "be a function parameter pack"); + /* Suppress errors that occur down the line. */ + if (declarator) + declarator->parameter_pack_p = false; + } + /* If a function parameter pack was specified and an implicit template parameter was introduced during cp_parser_parameter_declaration, change any implicit parameters introduced into packs. */ @@ -25829,7 +25848,7 @@ cp_parser_parameter_declaration (cp_parser *parser, if (default_argument) STRIP_ANY_LOCATION_WRAPPER (default_argument); - if (decl_spec_seq_has_spec_p (&decl_specifiers, ds_this)) + if (xobj_param_p) { if (default_argument) { diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics3.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics3.C index ec091d6ca67..304cf029f8f 100644 --- a/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics3.C +++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics3.C @@ -1,7 +1,9 @@ // P0847R7 // { dg-do compile { target c++23 } } -// rejection and diagnosis of an xobj parameter declared with a default argument +// rejection and diagnosis of an incorrectly declared xobj parameter + +// default argument struct S { void f0(this S = {}) {} // { dg-error "an explicit object parameter may not have a default argument" } @@ -18,3 +20,105 @@ void S::f2(this S = {}) {} // { dg-error "an explicit object parameter may not h void S::f11(this S s) {} void S::f12(this S s = {}) {} // { dg-error "an explicit object parameter may not have a default argument" } +// parameter pack + +struct S0 { + template + void f(this Selves...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void g(this Selves... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void h(this auto...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void j(this auto... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void fd(this Selves...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void gd(this Selves... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void hd(this auto...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void jd(this auto... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } +}; + +struct S1 { + template + void f(this Selves&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void g(this Selves&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void h(this auto&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void j(this auto&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void fd(this Selves&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void gd(this Selves&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void hd(this auto&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void jd(this auto&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } +}; + +struct S2 { + template + void f(this Selves&&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void g(this Selves&&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void h(this auto&&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void j(this auto&&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void fd(this Selves&&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void gd(this Selves&&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void hd(this auto&&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void jd(this auto&&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } +}; + +struct S3 { + template + void f(this Selves const&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void g(this Selves const&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void h(this auto const&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void j(this auto const&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void fd(this Selves const&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void gd(this Selves const&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void hd(this auto const&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void jd(this auto const&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } +}; + +struct S4 { + template + void f(this Selves const&&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void g(this Selves const&&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void h(this auto const&&...) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void j(this auto const&&... selves) {} // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void fd(this Selves const&&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + template + void gd(this Selves const&&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + + void hd(this auto const&&...); // { dg-error "an explicit object parameter cannot be a function parameter pack" } + void jd(this auto const&&... selves); // { dg-error "an explicit object parameter cannot be a function parameter pack" } +}; + -- 2.43.0