From: Jason Merrill <jason@redhat.com>
Date: Thu, 16 Mar 2023 19:11:25 +0000 (-0400)
Subject: c++: generic lambda, local class, __func__ [PR108242]
X-Git-Tag: releases/gcc-12.3.0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=890d711a2477119a34cf435f6159b6253b124374;p=thirdparty%2Fgcc.git

c++: generic lambda, local class, __func__ [PR108242]

Here we are trying to do name lookup in a deferred instantiation of t() and
failing to find __func__.  tsubst_expr already tries to instantiate members
of local classes, but was failing with the partial instantiation of generic
lambdas.

	PR c++/108242

gcc/cp/ChangeLog:

	* pt.cc (tsubst_expr) [TAG_DEFN]: Handle partial instantiation.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp1y/lambda-generic-func2.C: New test.
---

diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 4d6c6bfb8cf6..a9c57e5d45a7 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -19090,7 +19090,10 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl,
 
     case TAG_DEFN:
       tmp = tsubst (TREE_TYPE (t), args, complain, NULL_TREE);
-      if (CLASS_TYPE_P (tmp))
+      if (dependent_type_p (tmp))
+	/* This is a partial instantiation, try again when full.  */
+	add_stmt (build_min (TAG_DEFN, tmp));
+      else if (CLASS_TYPE_P (tmp))
 	{
 	  /* Local classes are not independent templates; they are
 	     instantiated along with their containing function.  And this
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-func2.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-func2.C
new file mode 100644
index 000000000000..ed541c7812f1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-func2.C
@@ -0,0 +1,18 @@
+// PR c++/108242
+// { dg-do compile { target c++14 } }
+
+template<int F>
+void my_fun()
+{
+    [&](auto) {
+        static constexpr char const* fun_name = __func__;
+        struct t
+        {
+            t() { fun_name; };
+        } t1;
+    }(12);
+}
+
+int main() {
+    my_fun<1>();
+}