From: Jason Merrill <jason@redhat.com>
Date: Thu, 16 Mar 2023 20:55:39 +0000 (-0400)
Subject: c++: restore instantiate_decl assert
X-Git-Tag: basepoints/gcc-15~9856
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95d4c0d2e6318aef88ba0bc607dfc1ec6b7a612f;p=thirdparty%2Fgcc.git

c++: restore instantiate_decl assert

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.
---

diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 93a055c66a1e..6df16fef0dd3 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);