From: Andrew Pinski <pinskia@physics.uc.edu>
Date: Wed, 11 Oct 2006 14:55:07 +0000 (+0000)
Subject: re PR c++/29002 (ICE on array of ptr-to-member or struct containing ptr-to-member... 
X-Git-Tag: releases/gcc-4.0.4~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b41c4f678d24023b4fda19b0de5254ba165a2fec;p=thirdparty%2Fgcc.git

re PR c++/29002 (ICE on array of ptr-to-member or struct containing ptr-to-member of unknown size)

2006-10-11  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-10-11  Andrew Pinski  <pinskia@physics.uc.edu>

        PR C++/29002
        * g++.dg/init/array22.C: New test.
        * g++.dg/init/array23.C: New test.

From-SVN: r117635
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2323905c5340..788e393d0fcc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-11  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-10-10  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR C++/28450
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 95026fd51a6b..a8249e7f452c 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -227,6 +227,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 fa28b43ae315..c28ad3893cf5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-11  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR C++/29002
+	* g++.dg/init/array22.C: New test.
+	* g++.dg/init/array23.C: New test.
+
 2006-10-10  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR C++/28450
diff --git a/gcc/testsuite/g++.dg/init/array22.C b/gcc/testsuite/g++.dg/init/array22.C
new file mode 100644
index 000000000000..0c5bb33da989
--- /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 000000000000..80ffb0a98cc2
--- /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" }