[pushed] c++: tweak C++20 destructor template-id rule

Message ID 20210915040452.957026-1-jason@redhat.com
State Committed
Commit f53a89fe722958d29fded71b444ff0f09b57b2c4
Series [pushed] c++: tweak C++20 destructor template-id rule |

Commit Message

Jason Merrill Sept. 15, 2021, 4:04 a.m. UTC
  While working on a larger change to destructor lookup I noticed that this
rule talks about declarators, but we weren't limiting the error to the case
where we're parsing a declarator.  I don't know if this actually broke
anything, since a CPP_TEMPLATE_ID would have to have been parsed once
before, but it's more correct this way.

Tested x86_64-pc-linux-gnu, applying to trunk.


	* parser.c (cp_parser_unqualified_id): Only complain about ~A<T> in
	a declarator.
 gcc/cp/parser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

base-commit: bd55fa102715c7442c050b193dadfdb5337e2377


diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e44c5c6b57c..ab1dc81b997 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -6379,7 +6379,8 @@  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 && cxx_dialect >= cxx20)
+	if (token->type == CPP_TEMPLATE_ID && declarator_p
+	    && cxx_dialect >= cxx20)
 	    if (!cp_parser_simulate_error (parser))
 	      error_at (tilde_loc, "template-id not allowed for destructor");