From 728da67271802eba3470cbe13025dea187d23520 Mon Sep 17 00:00:00 2001
From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Thu, 22 Jun 2006 09:55:42 +0000
Subject: [PATCH] re PR c++/28111 (ICE with invalid friend in template class)

	PR c++/28111
	* pt.c (determine_specialization): Check for invalid decls.

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

From-SVN: r114887
---
 gcc/cp/ChangeLog                         |  3 +++
 gcc/cp/pt.c                              |  2 +-
 gcc/testsuite/ChangeLog                  |  3 +++
 gcc/testsuite/g++.dg/template/friend43.C | 11 +++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/friend43.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ac044d179f9..ec07436f48c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/28111
+	* pt.c (determine_specialization): Check for invalid decls.
+
 	PR c++/28110
 	* pt.c (unify) <case TEMPLATE_PARM_INDEX>: Check for invalid
 	parameters.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f7bc7ce59a5..89afb5fe3b9 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1354,7 +1354,7 @@ determine_specialization (tree template_id,
 
   *targs_out = NULL_TREE;
 
-  if (template_id == error_mark_node)
+  if (template_id == error_mark_node || decl == error_mark_node)
     return error_mark_node;
 
   fns = TREE_OPERAND (template_id, 0);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a02dc4c4c28..013608b262a 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++/28111
+	* g++.dg/template/friend43.C: New test.
+
 	PR c++/28110
 	* g++.dg/template/crash53.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/template/friend43.C b/gcc/testsuite/g++.dg/template/friend43.C
new file mode 100644
index 00000000000..edbed8420d0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend43.C
@@ -0,0 +1,11 @@
+// PR c++/28111
+// { dg-do compile }
+
+template<typename> void foo();
+
+template<typename T> struct A
+{
+  friend void foo<>(typename T::X);  // { dg-error "not a class" }
+};
+
+A<int> a;