c++: further DR 2237 fix [PR97202]
Checks
Commit Message
Technically, not a regression. But it's such a simple fix for such
rare code that I think we should put it in now and be done with
DR 2237.
Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?
-- >8 --
With a redundant inline specifier like this:
template<typename Base> struct S : Base {
inline S<Base>() {}
};
we don't detect the simple-template-id as the declarator-id of the
constructor. The problem is that I check for CPP_TEMPLATE_ID too early,
at a point at which cp_parser_template_id may not have been called yet.
So let's check for it at the end of the function, after the tentative
parse and rollback.
PR c++/97202
gcc/cp/ChangeLog:
* parser.cc (cp_parser_constructor_declarator_p): Check CPP_TEMPLATE_ID
at the end of the function.
gcc/testsuite/ChangeLog:
* g++.dg/DRs/dr2237-5.C: New test.
---
gcc/cp/parser.cc | 4 +---
gcc/testsuite/g++.dg/DRs/dr2237-5.C | 7 +++++++
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/DRs/dr2237-5.C
base-commit: c5d34912ad576be1ef19be92f7eabde54b9089eb
prerequisite-patch-id: 2987a013eda8bc2ca9d8373eedac82067a654a5c
@@ -32337,8 +32337,6 @@ cp_parser_constructor_declarator_p (cp_parser *parser, cp_parser_flags flags,
&& 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);
@@ -32558,7 +32556,7 @@ cp_parser_constructor_declarator_p (cp_parser *parser, cp_parser_flags flags,
/* 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_lexer_peek_token (parser->lexer)->type == CPP_TEMPLATE_ID
&& !cp_parser_uncommitted_to_tentative_parse_p (parser))
{
auto_diagnostic_group d;
new file mode 100644
@@ -0,0 +1,7 @@
+// PR c++/97202
+// { dg-options "" }
+
+template<typename Base> struct S : Base {
+ inline S<Base>() {} // { dg-warning "template-id not allowed for constructor" "" { target c++20 } }
+ inline ~S<Base>() {} // { dg-warning "template-id not allowed for destructor" "" { target c++20 } }
+};