re PR c++/51399 ([c++0x] [4.7 Regression] ICE with invalid initializer list)

/cp
2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51399
	* init.c (perform_member_init): Early return if init is error_mark_node.

/testsuite
2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51399
	* g++.dg/cpp0x/initlist62.C: New.

From-SVN: r182025

gcc/cp/ChangeLog

 2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
 
+	PR c++/51399
+	* init.c (perform_member_init): Early return if init is error_mark_node.
+
+2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
 	PR c++/51414
 	* semantics.c (finish_underlying_type): Use %qT, not %qE for the
 	error message.

gcc/cp/init.c

@@ -542,6 +542,9 @@ perform_member_init (tree member, tree init)
 	}
     }
 
+  if (init == error_mark_node)
+    return;
+
   /* Effective C++ rule 12 requires that all data members be
      initialized.  */
   if (warn_ecpp && init == NULL_TREE && TREE_CODE (type) != ARRAY_TYPE)

gcc/testsuite/ChangeLog

+2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51399
+	* g++.dg/cpp0x/initlist62.C: New.
+
 2011-12-05  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/51338

gcc/testsuite/g++.dg/cpp0x/initlist62.C

+// PR c++/51399
+// { dg-options "-std=c++0x" }
+
+#include <initializer_list>
+
+struct A
+{
+  std::initializer_list<int> x[1] = { 0 };  // { dg-error "could not convert" }
+  A() {}
+};