re PR c++/12170 (ICE in cp_type_quals)

	PR c++/12170
	* pt.c (unify) <BOUND_TEMPLATE_TEMPLATE_PARM case>: Use only
	innermost set of template arguments during deduction.  Simplify.

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

From-SVN: r84921

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 00ef4b59ef187a1cd541852b9a318b49fcf4bbaf..f4db5d3f2561e63e4824dc6a1c5dfa6bd8588b0a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/12170
+       * pt.c (unify) <BOUND_TEMPLATE_TEMPLATE_PARM case>: Use only
+       innermost set of template arguments during deduction.  Simplify.
+
 2004-07-19  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        * typeck.c (build_modify_expr, build_x_modify_expr): Set

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 59eb9c742d400369d85bb51b9345c0d179e28e4e..b1d9de03cc0a66ecc35104b4f643ef518d35df3f 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9650,7 +9650,7 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict)
          {
            tree parmtmpl = TYPE_TI_TEMPLATE (parm);
            tree parmvec = TYPE_TI_ARGS (parm);
-           tree argvec = TYPE_TI_ARGS (arg);
+           tree argvec = INNERMOST_TEMPLATE_ARGS (TYPE_TI_ARGS (arg));
            tree argtmplvec
              = DECL_INNERMOST_TEMPLATE_PARMS (TYPE_TI_TEMPLATE (arg));
            int i;
@@ -9673,9 +9673,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict)
 
            for (i = 0; i < TREE_VEC_LENGTH (parmvec); ++i)
              {
-               tree t = TREE_VEC_ELT (parmvec, i);
-
-               if (unify (tparms, targs, t, 
+               if (unify (tparms, targs, 
+                          TREE_VEC_ELT (parmvec, i), 
                           TREE_VEC_ELT (argvec, i), 
                           UNIFY_ALLOW_NONE))
                  return 1;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ca5cb5d13c6322936a59e5ddb45547182f6bb57..51256e5403a33ed08a1c10df5c606547aa365e3a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/12170
+       * g++.dg/template/ttp9.C: New test.
+
 2004-07-19  Daniel Jacobowitz  <dan@debian.org>
 
        * gcc.dg/format/cmn-err-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/template/ttp9.C b/gcc/testsuite/g++.dg/template/ttp9.C
new file mode 100644 (file)
index 0000000..060ab77
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ttp9.C
@@ -0,0 +1,28 @@
+// { dg-do compile }
+
+// Origin: David Abrahams <dave@boost-consulting.com>
+//        Wolfgang Bangerth <bangerth@ticam.utexas.edu>
+
+// PR c++/12170: Deducing template template parameter from nested
+// class template.
+
+template <typename> struct W {};
+
+template< template<typename> class F, typename T>
+int foo(W< F<T> >);
+
+
+template<typename T>
+struct L  {
+    static int const value = sizeof(foo(W<T>()));
+    typedef T type;
+};
+
+
+template <typename>
+struct Y {
+    template <typename> struct X { typedef int type; };
+    typedef typename L<X<int> >::type type;
+};
+
+template struct Y<int>;