From: Jason Merrill <jason@redhat.com>
Date: Mon, 14 Jul 2014 20:39:35 +0000 (-0400)
Subject: re PR c++/61445 ([C++11] ice in instantiate_decl at cp/pt.c:19770)
X-Git-Tag: releases/gcc-5.1.0~6346
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d110c52ee3620c3ba0f23f113383b3e8e7b3c0eb;p=thirdparty%2Fgcc.git

re PR c++/61445 ([C++11] ice in instantiate_decl at cp/pt.c:19770)

	PR c++/61445
	PR c++/56947
	* pt.c (instantiate_decl): Don't check defer_ok for local class
	members.

From-SVN: r212524
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 98af8db9c4b4..0d66bb3820b9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-14  Jason Merrill  <jason@redhat.com>
+
+	PR c++/61445
+	PR c++/56947
+	* pt.c (instantiate_decl): Don't check defer_ok for local class
+	members.
+
 2014-07-14  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/61294
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7b79280da1ab..b32cf6c387da 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19775,11 +19775,6 @@ instantiate_decl (tree d, int defer_ok,
   if (external_p && !always_instantiate_p (d))
     return d;
 
-  /* Any local class members should be instantiated from the TAG_DEFN
-     with defer_ok == 0.  */
-  gcc_checking_assert (!defer_ok || !decl_function_context (d)
-		       || LAMBDA_TYPE_P (DECL_CONTEXT (d)));
-
   gen_tmpl = most_general_template (tmpl);
   gen_args = DECL_TI_ARGS (d);
 
diff --git a/gcc/testsuite/g++.dg/template/local9.C b/gcc/testsuite/g++.dg/template/local9.C
new file mode 100644
index 000000000000..90f14bb79683
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/local9.C
@@ -0,0 +1,15 @@
+// PR c++/61445
+
+template <typename T> void f (T)
+{
+  struct A
+  {
+    struct B { B(); };
+    void g () { B b; }
+  };
+}
+
+int main()
+{
+  f(0);
+}