aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2021-04-09 16:43:50 -0400
committerJason Merrill <jason@redhat.com>2021-04-10 00:06:55 -0400
commite89055f90cff9fb6f565b9374e1ab74f805682fb (patch)
tree364d0e0c09c1c61b39d4fd657fa515cc033354a5
parent3115aba8d856faadaab5c79bc4823a39ebc21bb2 (diff)
downloadgcc-e89055f90cff9fb6f565b9374e1ab74f805682fb.zip
gcc-e89055f90cff9fb6f565b9374e1ab74f805682fb.tar.gz
gcc-e89055f90cff9fb6f565b9374e1ab74f805682fb.tar.bz2
c++: pack in base-specifier in lambda [PR100006]
Normally cp_parser_base_clause prevents unexpanded packs, but in a lambda check_for_bare_parameter_packs allows it. Then we weren't finding the pack when scanning the lambda body. This doesn't fix a valid variant like template <class... Ts> void sink (Ts&&...); template <class... Ts> void f() { sink ([] { struct S : Ts { }; }...); } int main() { f<int>(); } but that's a much bigger project. gcc/cp/ChangeLog: PR c++/100006 * pt.c (find_parameter_packs_r) [TAG_DEFN]: Look into bases. gcc/testsuite/ChangeLog: PR c++/100006 * g++.dg/cpp0x/lambda/lambda-variadic13.C: New test.
-rw-r--r--gcc/cp/pt.c9
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic13.C11
2 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 01c807b..b32833003 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4061,6 +4061,15 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
*walk_subtrees = 0;
return NULL_TREE;
+ case TAG_DEFN:
+ /* Local class, need to look through the whole definition. */
+ t = TREE_TYPE (t);
+ if (CLASS_TYPE_P (t))
+ for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t)))
+ cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r,
+ ppd, ppd->visited);
+ return NULL_TREE;
+
default:
return NULL_TREE;
}
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic13.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic13.C
new file mode 100644
index 0000000..ac4e631
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic13.C
@@ -0,0 +1,11 @@
+// PR c++/100006
+// { dg-do compile { target c++14 } }
+
+template <class... Ts>
+void f() {
+ [] { struct S : Ts { }; }; // { dg-error "not expanded" }
+}
+
+int main() {
+ f<>();
+}