aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2023-03-16 15:11:25 -0400
committerJason Merrill <jason@redhat.com>2023-03-16 18:10:27 -0400
commitb323f52ccf966800297b0520b9e1d4b3951db525 (patch)
treea694e779041f3edf0b7628e0d7b746916ee2e64d /gcc
parent1cc8814098bb46f9fca58a0b831fbf9a8574bdc9 (diff)
downloadgcc-b323f52ccf966800297b0520b9e1d4b3951db525.zip
gcc-b323f52ccf966800297b0520b9e1d4b3951db525.tar.gz
gcc-b323f52ccf966800297b0520b9e1d4b3951db525.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/pt.cc5
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/lambda-generic-func2.C18
2 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index ddbd733..1072882 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -19341,7 +19341,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 0000000..ed541c7
--- /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>();
+}