From ea4e4e6e2f85186ddff69ced0b8647fac67d68ae Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 9 Oct 2014 14:05:29 -0400
Subject: [PATCH] re PR c++/63309 (internal compiler error: Segmentation fault)

	PR c++/63309
	* parser.c (cp_parser_class_head): push_template_decl for members
	of templates, too.

From-SVN: r216044
---
 gcc/cp/ChangeLog                        |  4 ++++
 gcc/cp/parser.c                         |  4 +---
 gcc/testsuite/g++.dg/template/nested6.C | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/nested6.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 09aad7db461..cf04f0dd704 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-10-09  Jason Merrill  <jason@redhat.com>
 
+	PR c++/63309
+	* parser.c (cp_parser_class_head): push_template_decl for members
+	of templates, too.
+
 	PR c++/63415
 	* pt.c (value_dependent_expression_p) [CONSTRUCTOR]: Check the type.
 	(iterative_hash_template_arg): Likewise.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index bc992b20045..a9edcd53df4 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -20222,9 +20222,7 @@ cp_parser_class_head (cp_parser* parser,
 	 template either from the template headers or the type we're
 	 defining, so that we diagnose both extra and missing headers.  */
       if ((PROCESSING_REAL_TEMPLATE_DECL_P ()
-	   || (CLASSTYPE_TEMPLATE_INFO (TREE_TYPE (type))
-	       && PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE
-				      (TREE_TYPE (type)))))
+	   || CLASSTYPE_TEMPLATE_INFO (TREE_TYPE (type)))
 	  && !CLASSTYPE_TEMPLATE_SPECIALIZATION (TREE_TYPE (type)))
 	{
 	  type = push_template_decl (type);
diff --git a/gcc/testsuite/g++.dg/template/nested6.C b/gcc/testsuite/g++.dg/template/nested6.C
new file mode 100644
index 00000000000..f5b8054a592
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/nested6.C
@@ -0,0 +1,19 @@
+// PR c++/63309
+
+template <class T>
+class A
+{
+public:
+    class B;
+};
+
+template <class T, class I>
+class A<T>::B			// { dg-error "template parameters|required" }
+{
+};
+
+int main()
+{
+    A<int>::B myB;		// { dg-prune-output "incomplete type" }
+    return 0;
+}
-- 
2.30.2