aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-04-21 17:24:07 -0400
committerJason Merrill <jason@redhat.com>2022-04-25 23:54:02 -0400
commit65735d21ac410463126114c572999682f987972c (patch)
tree44f743f3468b3ce2611a1c6c52181b3cf7b86bd2
parentc83b9c54d9dee2dce5d8268472a745b013d166cc (diff)
downloadgcc-65735d21ac410463126114c572999682f987972c.zip
gcc-65735d21ac410463126114c572999682f987972c.tar.gz
gcc-65735d21ac410463126114c572999682f987972c.tar.bz2
c++: generic lambda fn parm pack [PR104624]
Parameter packs from the enclosing context can be used unexpanded in a lambda that is itself part of a pack expansion, but not packs that are part of the lambda itself. We already check for capture packs; we also need to check for function parameter packs of the lambda call operator. PR c++/104624 gcc/cp/ChangeLog: * pt.cc (check_for_bare_parameter_packs): Check for lambda function parameter pack. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/lambda-generic-variadic22.C: New test.
-rw-r--r--gcc/cp/pt.cc4
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C15
2 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 7dd9e67..a77b316 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -4341,7 +4341,9 @@ check_for_bare_parameter_packs (tree t, location_t loc /* = UNKNOWN_LOCATION */)
parameter_packs = TREE_CHAIN (parameter_packs))
{
tree pack = TREE_VALUE (parameter_packs);
- if (is_capture_proxy (pack))
+ if (is_capture_proxy (pack)
+ || (TREE_CODE (pack) == PARM_DECL
+ && DECL_CONTEXT (DECL_CONTEXT (pack)) == lam))
break;
}
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C
new file mode 100644
index 0000000..670c598
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C
@@ -0,0 +1,15 @@
+// PR c++/104624
+// { dg-do compile { target c++14 } }
+
+template <typename T>
+auto f (T)
+{
+ auto a = [](auto ... i) // { dg-prune-output "incomplete type" }
+ {
+ int x[][i] = { 0 }; // { dg-error "not expanded" }
+ }();
+}
+void g ()
+{
+ f(0);
+}