From 77d3fb39c62558838c0e905df717903b5393dfc9 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 26 Jan 2024 17:33:51 -0500 Subject: [PATCH] c++: local class in generic lambda [PR113544] My earlier commit r14-278-gd60cbbfaa9a3ad was a start toward better handling of local classes in generic lambdas, but isn't actually useful by itself and breaks this testcase, so let's revert it for now. PR c++/113544 gcc/cp/ChangeLog: * pt.cc (instantiate_class_template): Don't partially instantiate. (tsubst_stmt): Likewise. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/lambda-generic-nested3.C: New test. --- gcc/cp/pt.cc | 14 +++++--------- .../g++.dg/cpp1y/lambda-generic-nested3.C | 11 +++++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/lambda-generic-nested3.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index f5bf159a879f..fb2448a26e96 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -12226,8 +12226,7 @@ instantiate_class_template (tree type) return error_mark_node; if (COMPLETE_OR_OPEN_TYPE_P (type) - || (uses_template_parms (type) - && !TYPE_FUNCTION_SCOPE_P (type))) + || uses_template_parms (type)) return type; /* Figure out which template is being instantiated. */ @@ -18893,7 +18892,10 @@ tsubst_stmt (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 @@ -18902,12 +18904,6 @@ tsubst_stmt (tree t, tree args, tsubst_flags_t complain, tree in_decl) /* Closures are handled by the LAMBDA_EXPR. */ gcc_assert (!LAMBDA_TYPE_P (TREE_TYPE (t))); complete_type (tmp); - if (dependent_type_p (tmp)) - { - /* This is a partial instantiation, try again when full. */ - add_stmt (build_min (TAG_DEFN, tmp)); - break; - } tree save_ccp = current_class_ptr; tree save_ccr = current_class_ref; for (tree fld = TYPE_FIELDS (tmp); fld; fld = DECL_CHAIN (fld)) diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-nested3.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-nested3.C new file mode 100644 index 000000000000..27655274a872 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-nested3.C @@ -0,0 +1,11 @@ +// PR c++/113544 +// { dg-do compile { target c++14 } } + +template +void f() { + [](auto parm) { + struct type : decltype(parm) { }; + }; +} + +template void f(); -- 2.47.2