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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 09aad7db461b3adbf8bceacfdef9a8da5b52d8d0..cf04f0dd704484b7a10b0242900d0bf9b7cc74eb 100644 (file)
--- 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 bc992b20045cfd4ea0d10247e4ee3ce7f00267e6..a9edcd53df470378bc0cf35470443211adb93257 100644 (file)
--- 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 (file)
index 0000000..f5b8054
--- /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;
+}