From 6df91b0004725e310b8dc7fa463745a703c1c059 Mon Sep 17 00:00:00 2001
From: Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
Date: Mon, 19 Jul 2004 15:03:58 +0000
Subject: [PATCH] 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
---
 gcc/cp/ChangeLog                     |  6 ++++++
 gcc/cp/pt.c                          |  7 +++----
 gcc/testsuite/ChangeLog              |  5 +++++
 gcc/testsuite/g++.dg/template/ttp9.C | 28 ++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/ttp9.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 00ef4b59ef18..f4db5d3f2561 100644
--- 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 59eb9c742d40..b1d9de03cc0a 100644
--- 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 1ca5cb5d13c6..51256e5403a3 100644
--- 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
index 000000000000..060ab7788aee
--- /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>;
-- 
2.47.3