From b6bb89777e6555619405ac85c024db4f43d10870 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Fri, 30 May 2014 14:55:56 -0400
Subject: [PATCH] re PR c++/56947 (Bogus 'XX' was not declared in this scope)

	PR c++/56947
	* pt.c (instantiate_decl): Check that defer_ok is not set for
	local class members.

From-SVN: r211094
---
 gcc/cp/ChangeLog                       |  4 ++++
 gcc/cp/pt.c                            |  5 +++++
 gcc/testsuite/g++.dg/template/local8.C | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/local8.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b3138014f44..34287b534d7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-30  Jason Merrill  <jason@redhat.com>
 
+	PR c++/56947
+	* pt.c (instantiate_decl): Check that defer_ok is not set for
+	local class members.
+
 	PR c++/60992
 	* pt.c (tsubst_init): Split out from...
 	(tsubst_expr) [DECL_EXPR]: Here.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a24e0443c9f..0d22fae0e6b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19696,6 +19696,11 @@ 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/local8.C b/gcc/testsuite/g++.dg/template/local8.C
new file mode 100644
index 00000000000..006bd8c40eb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/local8.C
@@ -0,0 +1,18 @@
+// PR c++/56947
+
+struct A
+{
+    A (int);
+};
+
+template < typename >
+void Fn ()
+{
+    const int kCapacity = 0;
+    struct Q:A
+    {
+        Q ():A (kCapacity) { }
+    };
+    Q q;
+}
+template void Fn < int >();