Revert fix for PR c++/30044

gcc/cp/ChangeLog:

	Revert:
	2015-06-23  Patrick Palka  <ppalka@gcc.gnu.org>

	PR c++/30044
	* parser.c (cp_parser_template_parameter_list): Update
	current_template_parms right after processing a paramater.
	* pt.c (template_parms_to_args): Remove obsolete hack for
	giving template template arguments the proper level.
	(check_default_tmpl_args): Account for tested template
	parameter_lists.
	(splite_late_return_type): Remove obsolete hack for giving
	template template arguments the proper level.

gcc/testsuite/ChangeLog:

	Revert:
	2015-06-23  Patrick Palka  <ppalka@gcc.gnu.org>

	PR c++/30044
	* g++.dg/cpp0x/auto45.C: New test.
	* g++.dg/template/pr30044.C: New test.
	* g++.dg/template/crash83.C: Accept any error string.
	* g++.dg/cpp0x/variadic18.C: Adjust to not shadow template
	parameters.
	* g++.dg/cpp0x/variadic18.C: Likewise
	* g++.dg/template/canon-type-13.C: Likewise.
	* g++.old-deja/g++.pt/ttp42.C: Likewise.

From-SVN: r224896

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 03f0989505214a8b3f5e3433e9293721f5561a52..4b275199f33687e96051f596cbaec0229bddb738 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,18 @@
+2015-06-24  Patrick Palka  <ppalka@gcc.gnu.org>
+
+       Revert:
+       2015-06-23  Patrick Palka  <ppalka@gcc.gnu.org>
+
+       PR c++/30044
+       * parser.c (cp_parser_template_parameter_list): Update
+       current_template_parms right after processing a paramater.
+       * pt.c (template_parms_to_args): Remove obsolete hack for
+       giving template template arguments the proper level.
+       (check_default_tmpl_args): Account for tested template
+       parameter_lists.
+       (splite_late_return_type): Remove obsolete hack for giving
+       template template arguments the proper level.
+
 2015-06-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/65811

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 98f0fb96918bd6c742c3e69b86af2b124d516235..9a1cbd814c0555dbef88db55ab9b09e42f81a320 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -13273,11 +13273,6 @@ cp_parser_template_parameter_list (cp_parser* parser)
 
   begin_template_parm_list ();
 
-  current_template_parms
-    = tree_cons (size_int (processing_template_decl),
-                make_tree_vec (0),
-                current_template_parms);
-
   /* The loop below parses the template parms.  We first need to know
      the total number of template parms to be able to compute proper
      canonical types of each dependent type. So after the loop, when
@@ -13290,7 +13285,6 @@ cp_parser_template_parameter_list (cp_parser* parser)
       bool is_non_type;
       bool is_parameter_pack;
       location_t parm_loc;
-      tree parameter_vec;
 
       /* Parse the template-parameter.  */
       parm_loc = cp_lexer_peek_token (parser->lexer)->location;
@@ -13315,27 +13309,8 @@ cp_parser_template_parameter_list (cp_parser* parser)
        break;
       /* Otherwise, consume the `,' token.  */
       cp_lexer_consume_token (parser->lexer);
-
-      /* Add the parameter we just processed to current_template_parms.  */
-
-      parameter_vec = make_tree_vec
-       (TREE_VEC_LENGTH (TREE_VALUE (current_template_parms)) + 1);
-
-      for (int i = 0; i < TREE_VEC_LENGTH (parameter_vec) - 1; i++)
-       TREE_VEC_ELT (parameter_vec, i)
-         = TREE_VEC_ELT (TREE_VALUE (current_template_parms), i);
-
-      TREE_VEC_ELT (parameter_vec, TREE_VEC_LENGTH (parameter_vec) - 1)
-       = tree_last (parameter_list);
-
-      current_template_parms
-       = tree_cons (TREE_PURPOSE (current_template_parms),
-                    parameter_vec,
-                    TREE_CHAIN (current_template_parms));
     }
 
-  current_template_parms = TREE_CHAIN (current_template_parms);
-
   return end_template_parm_list (parameter_list);
 }
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 953a4da2121fa285a1cc6ea95ced72943a3ef77c..8800af819ec7ffde1ccc8453effc8b50a7857bec 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3989,6 +3989,21 @@ template_parms_to_args (tree parms)
        args = a;
     }
 
+    if (length > 1 && TREE_VEC_ELT (args, 0) == NULL_TREE)
+      /* This can happen for template parms of a template template
+        parameter, e.g:
+
+        template<template<class T, class U> class TT> struct S;
+
+        Consider the level of the parms of TT; T and U both have
+        level 2; TT has no template parm of level 1. So in this case
+        the first element of full_template_args is NULL_TREE. If we
+        leave it like this TMPL_ARGS_DEPTH on args returns 1 instead
+        of 2. This will make tsubst wrongly consider that T and U
+        have level 1. Instead, let's create a dummy vector as the
+        first element of full_template_args so that TMPL_ARGS_DEPTH
+        returns the correct depth for args.  */
+      TREE_VEC_ELT (args, 0) = make_tree_vec (1);
   return args;
 }
 
@@ -4631,9 +4646,6 @@ check_default_tmpl_args (tree decl, tree parms, bool is_primary,
   else
     msg = G_("default argument for template parameter for class enclosing %qD");
 
-  /* By default check everything.  */
-  last_level_to_check = 1;
-
   if (current_class_type && TYPE_BEING_DEFINED (current_class_type))
     /* If we're inside a class definition, there's no need to
        examine the parameters to the class itself.  On the one
@@ -4643,12 +4655,10 @@ check_default_tmpl_args (tree decl, tree parms, bool is_primary,
         struct S { template <class U> void f(U); };
        Here the default argument for `S' has no bearing on the
        declaration of `f'.  */
-    last_level_to_check += template_class_depth (current_class_type);
-
-  if (processing_template_parmlist)
-    /* Likewise for parameters outside of the nested parameter list we have
-       just finished defining.  */
-    last_level_to_check += processing_template_parmlist;
+    last_level_to_check = template_class_depth (current_class_type) + 1;
+  else
+    /* Check everything.  */
+    last_level_to_check = 0;
 
   for (parm_level = parms;
        parm_level && TMPL_PARMS_DEPTH (parm_level) >= last_level_to_check;
@@ -22382,6 +22392,11 @@ splice_late_return_type (tree type, tree late_return_type)
     return type;
   argvec = make_tree_vec (1);
   TREE_VEC_ELT (argvec, 0) = late_return_type;
+  if (processing_template_parmlist)
+    /* For a late-specified return type in a template type-parameter, we
+       need to add a dummy argument level for its parmlist.  */
+    argvec = add_to_template_args
+      (make_tree_vec (processing_template_parmlist), argvec);
   if (current_template_parms)
     argvec = add_to_template_args (current_template_args (), argvec);
   return tsubst (type, argvec, tf_warning_or_error, NULL_TREE);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7786e48e8e94add94f712e04384a8ab04fb6d55d..7040593fbed44d274be5bf286ea6130a71df7f24 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2015-06-24  Patrick Palka  <ppalka@gcc.gnu.org>
+
+       Revert:
+       2015-06-23  Patrick Palka  <ppalka@gcc.gnu.org>
+
+       PR c++/30044
+       * g++.dg/cpp0x/auto45.C: New test.
+       * g++.dg/template/pr30044.C: New test.
+       * g++.dg/template/crash83.C: Accept any error string.
+       * g++.dg/cpp0x/variadic18.C: Adjust to not shadow template
+       parameters.
+       * g++.dg/cpp0x/variadic18.C: Likewise
+       * g++.dg/template/canon-type-13.C: Likewise.
+       * g++.old-deja/g++.pt/ttp42.C: Likewise.
+
 2015-06-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/65811

diff --git a/gcc/testsuite/g++.dg/cpp0x/auto45.C b/gcc/testsuite/g++.dg/cpp0x/auto45.C
deleted file mode 100644 (file)
index 09e9f44..0000000
--- a/gcc/testsuite/g++.dg/cpp0x/auto45.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// Addendum to auto23.C, now with nested template parameter lists
-// { dg-do compile { target c++11 } }
-
-template<template <auto f()->int> class> struct A { };
-template<template <template <auto f()->int> class> class> struct B { };

diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic18.C b/gcc/testsuite/g++.dg/cpp0x/variadic18.C
index 57fdc865501f31232e7a5441f596094bf8841003..fc0e2ddcf51f8b3f6b0fdbb9b1e2ac10e681e0f1 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/variadic18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic18.C
@@ -1,7 +1,7 @@
 // { dg-do compile { target c++11 } }
 template<typename...> class tuple { };
 
-template<typename T, template<typename U> class... Metafunctions>
+template<typename T, template<typename T> class... Metafunctions>
 struct apply_all
 {
   typedef tuple<typename Metafunctions<T>::type...> type;

diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic19.C b/gcc/testsuite/g++.dg/cpp0x/variadic19.C
index 3be9bb022dcf104e2d44aae0c2e0a65ad1da19a4..0ae2672bff044aa3f17f6f5665824663b1b256a4 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/variadic19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic19.C
@@ -4,7 +4,7 @@ struct tuple {
   static const int value = 0;
 };
 
-template<typename T, template<class U> class... Metafunctions>
+template<typename T, template<class T> class... Metafunctions>
 struct tuple<Metafunctions<T>...> {
   static const int value = 1;
 };

diff --git a/gcc/testsuite/g++.dg/template/canon-type-13.C b/gcc/testsuite/g++.dg/template/canon-type-13.C
index 5a8d37d18f3d46386834fb705761a03c054c2d0a..4f3702b842d0250b0dd490d810f43b6382886886 100644 (file)
--- a/gcc/testsuite/g++.dg/template/canon-type-13.C
+++ b/gcc/testsuite/g++.dg/template/canon-type-13.C
@@ -11,7 +11,7 @@ struct S1
 {
 };
 
-template<class T, template<class U>  class A, template<class U>  class B = A>
+template<class T, template<class T>  class A, template<class T>  class B = A>
 struct C
 {
   B<T> m;

diff --git a/gcc/testsuite/g++.dg/template/crash83.C b/gcc/testsuite/g++.dg/template/crash83.C
index 7dcbed93d164698753ade9d83a1b92fcd1b1c1d1..b83dd213971447fde477fc78448d14ffa3b25478 100644 (file)
--- a/gcc/testsuite/g++.dg/template/crash83.C
+++ b/gcc/testsuite/g++.dg/template/crash83.C
@@ -2,4 +2,4 @@
 
 template<int> struct A {};
 
-template<typename = class A<0>: > struct B {}; // { dg-error "" }
+template<typename = class A<0>: > struct B {}; // { dg-error "explicit specialization|expected" }

diff --git a/gcc/testsuite/g++.dg/template/pr30044.C b/gcc/testsuite/g++.dg/template/pr30044.C
deleted file mode 100644 (file)
index fe0a470..0000000
--- a/gcc/testsuite/g++.dg/template/pr30044.C
+++ /dev/null
@@ -1,16 +0,0 @@
-// PR c++/30044
-
-template <typename T1, typename T2, template <T2> class Comp, class Result = Comp<1> >
-struct sort { };
-
-
-template <typename Type, template <Type, Type> class Comp, class Result = Comp<1, 2> >
-struct sort2 { };
-
-template <typename Type, template <int, Type> class Comp, class Result = Comp<1, 2> >
-struct sort3 { };
-
-template <template <typename T1, typename T2, template <T2> class Comp, class Result = Comp<1> > class Foo>
-struct sort4 { };
-
-

diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index 9bd8cc38c44c9a298c7accce0ecd2eaf5fbbb307..15d1ac74c993a7427f35feb02ba67059f66a5478 100644 (file)
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -89,7 +89,7 @@ namespace __gnu_test {
         SharedInfo->first=ptr;
       }
     };
-    template <class T, template<class U> class ItType>   struct test_container   {
+    template <class T, template<class T> class ItType>   struct test_container   {
       typename ItType<T>::ContainerType bounds;
       test_container(T* _first, T* _last):bounds(_first, _last)     {
   }

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/ttp42.C b/gcc/testsuite/g++.old-deja/g++.pt/ttp42.C
index a2ac239611001b0059475acb5b09d5ca9154018b..53bdae1e9b8bc9ad75a7565b8d7ed530fb29109f 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.pt/ttp42.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/ttp42.C
@@ -1,5 +1,5 @@
 // { dg-do run  }
-template <class T, template <class U> class C>
+template <class T, template <class T> class C>
 struct X
 {};