From 3e9ac7e52541c6612146354b8d2d12badd45eec1 Mon Sep 17 00:00:00 2001
From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Thu, 22 Jun 2006 09:47:51 +0000
Subject: [PATCH] re PR c++/28110 (ICE with invalid template constant
 parameter)

	PR c++/28110
	* pt.c (unify) <case TEMPLATE_PARM_INDEX>: Check for invalid
	parameters.

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

From-SVN: r114885
---
 gcc/cp/ChangeLog                        |  4 ++++
 gcc/cp/pt.c                             |  2 ++
 gcc/testsuite/ChangeLog                 |  3 +++
 gcc/testsuite/g++.dg/template/crash53.C | 11 +++++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/crash53.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f666fab0b10c..ac044d179f9b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2006-06-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/28110
+	* pt.c (unify) <case TEMPLATE_PARM_INDEX>: Check for invalid
+	parameters.
+
 	PR c++/28109
 	* rtti.c (get_tinfo_decl_dynamic): Robustify.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 08bda26d6b83..f7bc7ce59a5c 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10281,6 +10281,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict)
 
     case TEMPLATE_PARM_INDEX:
       tparm = TREE_VALUE (TREE_VEC_ELT (tparms, 0));
+      if (tparm == error_mark_node)
+	return 1;
 
       if (TEMPLATE_PARM_LEVEL (parm)
 	  != template_decl_level (tparm))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d08e87c75f87..a02dc4c4c285 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/28110
+	* g++.dg/template/crash53.C: New test.
+
 	PR c++/28109
 	* g++.dg/rtti/incomplete1.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/template/crash53.C b/gcc/testsuite/g++.dg/template/crash53.C
new file mode 100644
index 000000000000..bbd1e7fc7aeb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash53.C
@@ -0,0 +1,11 @@
+// PR c++/28110
+// { dg-do compile }
+
+template<int> struct A {};
+
+template<typename T> struct B
+{
+  template<T I> B(A<I>);  // { dg-error "template constant parameter" }
+};
+
+B<double> a=A<0>();  // { dg-error "non-scalar type" }
-- 
2.47.2