diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bcb6dc8fe61..1123643c893 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-14  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR C++/29002
+	* init.c (build_zero_init): If we have an error mark node for
+	the array size, return.
+
 2006-09-10  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/28991
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index ad40736c60b..8faa03d393e 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -223,6 +223,11 @@ build_zero_init (tree type, tree nelts, bool static_storage_p)
 				 nelts, integer_one_node);
       else
 	max_index = array_type_nelts (type);
+
+      /* If we have an error_mark here, we should just return error mark
+	 as we don't know the size of the array yet.  */
+      if (max_index == error_mark_node)
+	return error_mark_node;
       gcc_assert (TREE_CODE (max_index) == INTEGER_CST);
 
       /* A zero-sized array, which is accepted as an extension, will
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1581faf757..fd06af6d758 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-14  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR C++/29002
+	* g++.dg/init/array22.C: New test.
+	* g++.dg/init/array23.C: New test.
+
 2006-09-14  Arnaud Charlet  <charlet@adacore.com>
 
 	* stackcheck.lst: Update list of tests requiring stack checking.
diff --git a/gcc/testsuite/g++.dg/init/array22.C b/gcc/testsuite/g++.dg/init/array22.C
new file mode 100644
index 00000000000..0c5bb33da98
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/array22.C
@@ -0,0 +1,6 @@
+// PR C++/29002
+// We ICE trying to set the "zero" initializer on the incomplete
+//  array
+
+struct A {};
+int A::* x[]; // { dg-error "size" }
diff --git a/gcc/testsuite/g++.dg/init/array23.C b/gcc/testsuite/g++.dg/init/array23.C
new file mode 100644
index 00000000000..80ffb0a98cc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/array23.C
@@ -0,0 +1,6 @@
+// PR C++/29002
+// We ICE trying to set the "zero" initializer on the incomplete
+//  array
+
+struct A {A();int A::* t;};
+A x[]; // { dg-error "size" }