aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorwaffl3x <waffl3x@protonmail.com>2024-01-12 07:40:19 +0000
committerJason Merrill <jason@redhat.com>2024-01-16 16:10:48 -0500
commit6aae831a3fe6619794afa79410e6fc1b4817f0b1 (patch)
treeeed3bae44f831b2e340dda698566b47953c0efff /gcc/cp
parent075f2cc29c2a4fb70c9d2180f45daa36fef3f5a8 (diff)
downloadgcc-6aae831a3fe6619794afa79410e6fc1b4817f0b1.zip
gcc-6aae831a3fe6619794afa79410e6fc1b4817f0b1.tar.gz
gcc-6aae831a3fe6619794afa79410e6fc1b4817f0b1.tar.bz2
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 <waffl3x@protonmail.com>
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/parser.cc21
1 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index c7ad3ec..3748ccd 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -25714,6 +25714,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. */
@@ -25837,7 +25856,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)
{