re PR c++/14429 (valid template template argument rejected)

	PR c++/14429
	* pt.c (coerce_template_template_parms) <PARM_DECL case>: Only check
	when the type of ARG is not dependent.

	* g++.dg/template/ttp11.C: New test.

From-SVN: r85222

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 329b12e5c7be1607e5e8f47cc02d20366b0e41e7..3a270bc3fd9f68022e4df1035c3d1cdf753528c1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-27  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/14429
+       * pt.c (coerce_template_template_parms) <PARM_DECL case>: Only check
+       when the type of ARG is not dependent.
+
 2004-07-26  Geoffrey Keating  <geoffk@apple.com>
 
        * g++spec.c (LIBSTDCXX_PROFILE): Default to LIBSTDCXX.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ca84b39442376c3eda8beffffca773bcb8953eee..7ae18f8f120cdfef1442486b06a835e9900a3ff1 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3639,11 +3639,16 @@ coerce_template_template_parms (tree parm_parms,
 
        case PARM_DECL:
          /* The tsubst call is used to handle cases such as
-              template <class T, template <T> class TT> class D;  
+
+              template <int> class C {};
+              template <class T, template <T> class TT> class D {};
+              D<int, C> d;
+
             i.e. the parameter list of TT depends on earlier parameters.  */
-         if (!same_type_p
-             (tsubst (TREE_TYPE (parm), outer_args, complain, in_decl),
-              TREE_TYPE (arg)))
+         if (!dependent_type_p (TREE_TYPE (arg))
+             && !same_type_p
+                   (tsubst (TREE_TYPE (parm), outer_args, complain, in_decl),
+                            TREE_TYPE (arg)))
            return 0;
          break;
          

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bf23710359668442c7175a06280297d88b76eedc..bc4bea228675dd537c7b817860cedcabac5c3ccf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-27  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/14429
+       * g++.dg/template/ttp11.C: New test.
+
 2004-07-27  Diego Novillo  <dnovillo@redhat.com>
 
        * gcc.c-torture/compile/20040727-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/template/ttp11.C b/gcc/testsuite/g++.dg/template/ttp11.C
new file mode 100644 (file)
index 0000000..84867e1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ttp11.C
@@ -0,0 +1,14 @@
+// { dg-do compile }
+
+// Origin: heinlein@informatik.uni-ulm.de
+
+// PR c++/14429: Matching of template template parameter containing
+// non-type parameter with type that depends on earlier parameter.
+
+template <template <typename U, U* p> class T>
+struct X {};
+
+template <template <typename U, U* p> class T>
+struct Y {
+    X<T> x;
+};

diff --git a/gcc/testsuite/g++.dg/template/ttp12.C b/gcc/testsuite/g++.dg/template/ttp12.C
new file mode 100644 (file)
index 0000000..554738b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ttp12.C
@@ -0,0 +1,19 @@
+// Copyright (C) 2004 Free Software Foundation
+// Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
+// { dg-do compile }
+
+// Check the type of non-type parameter in template template parameter
+// only if it is dependent.
+
+template <template <int* p> class T>
+struct X {};
+
+template <typename U, template <U* p> class T>
+struct Y {
+    X<T> x;
+};
+
+template <int* p> struct Z {};
+
+Y<int, Z> y1;
+Y<char, Z> y2;         // { dg-error "mismatch|expected|invalid" }