c++: parse error with >= in template argument list [PR105436]
This patch fixes an oversight whereby we treated >= as the end of a template argument. This causes problems in C++14, because in cp_parser_template_argument we go different ways for C++14 and C++17: /* It must be a non-type argument. In C++17 any constant-expression is allowed. */ if (cxx_dialect > cxx14) goto general_expr; so in this testcase in C++14 we get "N" as the template argument but in C++17 it is the whole "N >= 5" expression. So in C++14 the remaining ">= 5" triggered the newly-added diagnostic. PR c++/105436 gcc/cp/ChangeLog: * parser.cc (cp_parser_next_token_ends_template_argument_p): Don't return true for CPP_GREATER_EQ. gcc/testsuite/ChangeLog: * g++.dg/parse/template31.C: New test.
This commit is contained in:
parent
22399ad6ed
commit
79a1a01cbd
2 changed files with 4 additions and 1 deletions
|
@ -33224,7 +33224,6 @@ cp_parser_next_token_ends_template_argument_p (cp_parser *parser)
|
|||
|| ((cxx_dialect != cxx98) && token->type == CPP_RSHIFT)
|
||||
/* For better diagnostics, treat >>= like that too, that
|
||||
shouldn't appear non-nested in template arguments. */
|
||||
|| token->type == CPP_GREATER_EQ
|
||||
|| token->type == CPP_RSHIFT_EQ);
|
||||
}
|
||||
|
||||
|
|
4
gcc/testsuite/g++.dg/parse/template31.C
Normal file
4
gcc/testsuite/g++.dg/parse/template31.C
Normal file
|
@ -0,0 +1,4 @@
|
|||
// PR c++/105436
|
||||
|
||||
template<bool> struct A;
|
||||
template<int N> A<N >= 5> f();
|
Loading…
Add table
Reference in a new issue