From 4e3bd7d56163a9d91ba255cbbbf4fa234b3da11a Mon Sep 17 00:00:00 2001
From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Mon, 24 Apr 2006 08:38:05 +0000
Subject: [PATCH] re PR c++/19963 (ICE on invalid member declaration)

	PR c++/19963
	* class.c (layout_class_type): Skip fields with invalid types.

	* g++.dg/other/incomplete2.C: New test.

From-SVN: r113220
---
 gcc/cp/ChangeLog                         |  5 +++++
 gcc/cp/class.c                           |  2 ++
 gcc/testsuite/ChangeLog                  |  5 +++++
 gcc/testsuite/g++.dg/other/incomplete2.C | 14 ++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/other/incomplete2.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0d24702efa8..fe48ced0532 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-24  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/19963
+	* class.c (layout_class_type): Skip fields with invalid types.
+
 2006-04-23  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/26912
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 1cf87dc18a3..a7536bb7ce9 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4607,6 +4607,8 @@ layout_class_type (tree t, tree *virtuals_p)
 	}
 
       type = TREE_TYPE (field);
+      if (type == error_mark_node)
+	continue;
 
       padding = NULL_TREE;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3c6b413274c..f477f4b89c1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-24  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/19963
+	* g++.dg/other/incomplete2.C: New test.
+
 2006-04-24  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/26869
diff --git a/gcc/testsuite/g++.dg/other/incomplete2.C b/gcc/testsuite/g++.dg/other/incomplete2.C
new file mode 100644
index 00000000000..127bf588e93
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/incomplete2.C
@@ -0,0 +1,14 @@
+// PR c++/19963
+// { dg-do compile }
+
+struct A;
+
+struct B
+{
+  A a : 1;  // { dg-error "incomplete" }
+};
+
+struct S
+{
+  S : 1;    // { dg-error "incomplete" }
+};