diff options
| author | Jason Merrill <jason@redhat.com> | 2022-05-11 14:53:26 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-05-11 15:30:17 -0400 |
| commit | 88459c3965e2a2f62ab4d4c8b2ac8460b1a15c33 (patch) | |
| tree | 94e5295924083ad979f32ab1373c7b3e3d4816c4 /gcc/cp/cp-tree.h | |
| parent | 4dc86f716fe6087f1cf786d69c0c6f3f5af810f0 (diff) | |
| download | gcc-88459c3965e2a2f62ab4d4c8b2ac8460b1a15c33.zip gcc-88459c3965e2a2f62ab4d4c8b2ac8460b1a15c33.tar.gz gcc-88459c3965e2a2f62ab4d4c8b2ac8460b1a15c33.tar.bz2 | |
c++: lambda template in requires [PR105541]
Since the patch for PR103408, the template parameters for the lambda in this
test have level 1 instead of 2, and we were treating null template args as 1
level of arguments, so tsubst_template_parms decided it had nothing to do.
Fixed by distinguishing between <> and no args at all, which is what we have
in our "substitution" in a requires-expression.
PR c++/105541
gcc/cp/ChangeLog:
* cp-tree.h (TMPL_ARGS_DEPTH): 0 for null args.
* parser.cc (cp_parser_enclosed_template_argument_list):
Use 0-length TREE_VEC for <>.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/lambda-requires1.C: New test.
Diffstat (limited to 'gcc/cp/cp-tree.h')
| -rw-r--r-- | gcc/cp/cp-tree.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index e16b8d7..b6961a7 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3771,11 +3771,13 @@ struct GTY(()) lang_decl { /* The depth of a template argument vector. When called directly by the parser, we use a TREE_LIST rather than a TREE_VEC to represent - template arguments. In fact, we may even see NULL_TREE if there - are no template arguments. In both of those cases, there is only - one level of template arguments. */ -#define TMPL_ARGS_DEPTH(NODE) \ - (TMPL_ARGS_HAVE_MULTIPLE_LEVELS (NODE) ? TREE_VEC_LENGTH (NODE) : 1) + template arguments. In that case, there is only one level of template + arguments. We may even see NULL_TREE if there are 0 levels of + template arguments, as in cp_parser_requires_expression. */ +#define TMPL_ARGS_DEPTH(NODE) \ + ((NODE) == NULL_TREE ? 0 \ + : TMPL_ARGS_HAVE_MULTIPLE_LEVELS (NODE) ? TREE_VEC_LENGTH (NODE) \ + : 1) /* The LEVELth level of the template ARGS. The outermost level of args is level 1, not level 0. */ |