From 16d5ffec52cbe1c4e6d10ca67656fec7eb6badcd Mon Sep 17 00:00:00 2001
From: Simon Martin <simartin@users.sourceforge.net>
Date: Tue, 7 Oct 2008 20:56:53 +0000
Subject: [PATCH] re PR c/35437 (ICE with struct containing incomplete type)

gcc/

2008-10-07  Simon Martin  <simartin@users.sourceforge.net>

        PR c/35437
        * expr.c (count_type_elements): Handle ERROR_MARK.

gcc/testsuite/

2008-01-07  Simon Martin  <simartin@users.sourceforge.net>

        PR c/35437
        * gcc.dg/struct-parse-2.c: New test.
        * g++.dg/parse/struct-4.C: New test.

From-SVN: r140953
---
 gcc/ChangeLog                         |  5 +++++
 gcc/expr.c                            |  3 +++
 gcc/testsuite/ChangeLog               |  6 ++++++
 gcc/testsuite/g++.dg/parse/struct-4.C | 13 +++++++++++++
 gcc/testsuite/gcc.dg/struct-parse-2.c | 13 +++++++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/parse/struct-4.C
 create mode 100644 gcc/testsuite/gcc.dg/struct-parse-2.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c0208699b5..adbd5a18491 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-07  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c/35437
+	* expr.c (count_type_elements): Handle ERROR_MARK.
+
 2008-10-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/29609
diff --git a/gcc/expr.c b/gcc/expr.c
index 32c8d01fe7f..277a6e1a33a 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -5021,6 +5021,9 @@ count_type_elements (const_tree type, bool allow_flexarr)
     case REFERENCE_TYPE:
       return 1;
 
+    case ERROR_MARK:
+      return 0;
+
     case VOID_TYPE:
     case METHOD_TYPE:
     case FUNCTION_TYPE:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3ba82219cf2..cc7ec163e07 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-07  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c/35437
+	* gcc.dg/struct-parse-2.c: New test.
+	* g++.dg/parse/struct-4.C: New test.
+
 2008-10-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/29609
diff --git a/gcc/testsuite/g++.dg/parse/struct-4.C b/gcc/testsuite/g++.dg/parse/struct-4.C
new file mode 100644
index 00000000000..559411a19cf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/struct-4.C
@@ -0,0 +1,13 @@
+/* PR c/35437 */
+/* { dg-do "compile" } */
+
+struct A
+{
+  int i;
+  struct A a; /* { dg-error "has incomplete type" } */
+};
+
+void foo()
+{
+  struct A b = { 0 };
+}
diff --git a/gcc/testsuite/gcc.dg/struct-parse-2.c b/gcc/testsuite/gcc.dg/struct-parse-2.c
new file mode 100644
index 00000000000..559411a19cf
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/struct-parse-2.c
@@ -0,0 +1,13 @@
+/* PR c/35437 */
+/* { dg-do "compile" } */
+
+struct A
+{
+  int i;
+  struct A a; /* { dg-error "has incomplete type" } */
+};
+
+void foo()
+{
+  struct A b = { 0 };
+}