From bef89e9e0929d4c17cfa23c0ab8c8cc3315a88c9 Mon Sep 17 00:00:00 2001
From: Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
Date: Tue, 22 Jul 2003 14:36:00 +0000
Subject: [PATCH] re PR c++/10793 (ICE (treecheck) when partial-specializing
 with an invalid type and a base class, in xref_basetypes, at cp/decl.c:12834)

	PR c++/10793
	* decl.c (xref_basetypes): Handle error_mark_node.

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

From-SVN: r69671
---
 gcc/cp/ChangeLog                    | 5 +++++
 gcc/cp/decl.c                       | 3 +++
 gcc/testsuite/ChangeLog             | 5 +++++
 gcc/testsuite/g++.dg/parse/crash9.C | 9 +++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/parse/crash9.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d7a59661e24..79565c65bec 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-22  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/10793
+	* decl.c (xref_basetypes): Handle error_mark_node.
+
 2003-07-22  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* cp-tree.h (enum cp_lvalue_kind): Add clk_packed.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index eb0902d23ba..9e90d9e9045 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12831,6 +12831,9 @@ xref_basetypes (tree ref, tree base_list)
   int i;
   enum tag_types tag_code;
 
+  if (ref == error_mark_node)
+    return;
+
   if (TREE_CODE (ref) == UNION_TYPE)
     {
       error ("derived union `%T' invalid", ref);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 49f0c618e68..eddfa73d3b4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-22  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/10793
+	* g++.dg/template/crash9.C: New test.
+
 2003-07-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/3004
diff --git a/gcc/testsuite/g++.dg/parse/crash9.C b/gcc/testsuite/g++.dg/parse/crash9.C
new file mode 100644
index 00000000000..44ce57b1316
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash9.C
@@ -0,0 +1,9 @@
+// { dg-do compile }
+
+// Origin: Volker Reichelt <reichelt@gcc.gnu.org>
+
+// PR c++/10793: ICE in handling base class when the current class
+// contains error.
+
+template <typename> struct A {};
+template <typename> struct A<INVALID> : A<int> { }; // { dg-error "not declared|invalid" }
-- 
2.30.2