From: Jason Merrill <jason@redhat.com>
Date: Thu, 12 Jan 2012 17:26:57 +0000 (-0500)
Subject: re PR c++/51403 (ICE with invalid template parameter)
X-Git-Tag: releases/gcc-4.7.0~1024
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca5333f22c94c1ad873265bde286cf9b96df5ff2;p=thirdparty%2Fgcc.git

re PR c++/51403 (ICE with invalid template parameter)

	PR c++/51403
	* pt.c (unify): Handle error_mark_node.

From-SVN: r183132
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b11d6bf2448c..9af1a140d0da 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51403
+	* pt.c (unify): Handle error_mark_node.
+
 2012-01-11  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51565
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ac72b6ddaaa5..97a92941c61d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16272,6 +16272,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict,
       idx = TEMPLATE_TYPE_IDX (parm);
       targ = TREE_VEC_ELT (INNERMOST_TEMPLATE_ARGS (targs), idx);
       tparm = TREE_VALUE (TREE_VEC_ELT (tparms, idx));
+      if (tparm == error_mark_node)
+	return unify_invalid (explain_p);
 
       /* Check for mixed types and values.  */
       if ((TREE_CODE (parm) == TEMPLATE_TYPE_PARM
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56f28ee354b8..53dda864d66f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51403
+	* g++.dg/template/arg8.C: New.
+
 2012-01-12  Ira Rosen  <irar@il.ibm.com>
 
 	PR tree-optimization/51799
diff --git a/gcc/testsuite/g++.dg/template/arg8.C b/gcc/testsuite/g++.dg/template/arg8.C
new file mode 100644
index 000000000000..adcd013e3068
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/arg8.C
@@ -0,0 +1,7 @@
+template<typename T, void, typename U> // { dg-error "void" }
+void foo(T, U, int) {}
+
+void bar()
+{
+  foo(0, 0, 0);			// { dg-error "no match" }
+}