From: Dodji Seketeli <dodji@redhat.com>
Date: Tue, 4 May 2010 09:49:45 +0000 (+0000)
Subject: re PR c++/43953 (ICE: dependent_type_p, at cp/pt.c:17404)
X-Git-Tag: releases/gcc-4.6.0~7513
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f857e9a46ef3bfbf8e1a42aec86d7033ad343d87;p=thirdparty%2Fgcc.git

re PR c++/43953 (ICE: dependent_type_p, at cp/pt.c:17404)

Fix PR c++/43953

gcc/cp/ChangeLog:
	PR c++/43953
	* pt.c (most_specialized_class): Pretend we are processing
	a template decl during the call to coerce_template_parms.

gcc/testsuite/ChangeLog:
	PR c++/43953
	* g++.dg/other/crash-12.C: New test.

From-SVN: r159019
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 23e55567c273..026abe8254de 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-03  Dodji Seketeli  <dodji@redhat.com>
+
+	PR c++/43953
+	* pt.c (most_specialized_class): Pretend we are processing
+	a template decl during the call to coerce_template_parms.
+
 2010-05-03  Jason Merrill  <jason@redhat.com>
 
 	PR c++/42810
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 29489b6337c3..fbf9b905c028 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15941,12 +15941,13 @@ most_specialized_class (tree type, tree tmpl)
       tree parms = TREE_VALUE (t);
 
       partial_spec_args = CLASSTYPE_TI_ARGS (TREE_TYPE (t));
+
+      ++processing_template_decl;
+
       if (outer_args)
 	{
 	  int i;
 
-	  ++processing_template_decl;
-
 	  /* Discard the outer levels of args, and then substitute in the
 	     template args from the enclosing class.  */
 	  partial_spec_args = INNERMOST_TEMPLATE_ARGS (partial_spec_args);
@@ -15963,7 +15964,6 @@ most_specialized_class (tree type, tree tmpl)
 	    TREE_VEC_ELT (parms, i) =
 	      tsubst (TREE_VEC_ELT (parms, i), outer_args, tf_none, NULL_TREE);
 
-	  --processing_template_decl;
 	}
 
       partial_spec_args =
@@ -15974,6 +15974,8 @@ most_specialized_class (tree type, tree tmpl)
 				 /*require_all_args=*/true,
 				 /*use_default_args=*/true);
 
+      --processing_template_decl;
+
       if (partial_spec_args == error_mark_node)
 	return error_mark_node;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d3d168fe621d..4c7f13da7894 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-03  Dodji Seketeli  <dodji@redhat.com>
+
+	PR c++/43953
+	* g++.dg/other/crash-12.C: New test.
+
 2010-05-03  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* g++.dg/cdce3.C: Add a space.  Updated.
diff --git a/gcc/testsuite/g++.dg/other/crash-12.C b/gcc/testsuite/g++.dg/other/crash-12.C
new file mode 100644
index 000000000000..6612ff216ba7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/crash-12.C
@@ -0,0 +1,25 @@
+// Origin: PR c++/43953
+
+template<typename T,
+         typename U,
+	 typename T::type V> class bad;
+
+// partial specialization
+// for T = U
+template<typename T, typename T::type V>
+class bad<T, T, V>
+{
+public:
+  static void foo() {}
+};
+
+struct dummy
+{
+  typedef int type;
+};
+
+int main()
+{
+  bad<dummy, dummy, 0>::foo();
+}
+