Tested x86_64-pc-linux-gnu, applying to trunk.
-- 8< --
For PR61445 I removed this assert, but PR108242 demonstrated why it's still
useful; to avoid regressing the former testcase I check pattern_defined
in the assert.
This reverts r212524.
PR c++/61445
gcc/cp/ChangeLog:
* pt.cc (instantiate_decl): Assert !defer_ok for local
class members.
---
gcc/cp/pt.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 93a055c66a1..6df16fef0dd 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -27090,6 +27090,12 @@ instantiate_decl (tree d, bool defer_ok, bool
expl_inst_class_mem_p)
pattern_defined = ! DECL_EXTERNAL (code_pattern);
}
+ /* Any local class members should be instantiated from the TAG_DEFN
+ with defer_ok == 0. */
+ gcc_checking_assert (!defer_ok || !pattern_defined
+ || !decl_function_context (d)
+ || LAMBDA_TYPE_P (DECL_CONTEXT (d)));
+
/* We may be in the middle of deferred access check. Disable it now. */
push_deferring_access_checks (dk_no_deferred);
base-commit: 9b40ca2569d71e54d7dbbdbfd00d733770576f6f
--
2.31.1
