From 65735d21ac410463126114c572999682f987972c Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 21 Apr 2022 17:24:07 -0400
Subject: [PATCH] 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.
---
 gcc/cp/pt.cc                                           |  4 +++-
 gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C

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);
+}
-- 
2.7.4