[C++ Patch] PR 51399

[Paolo Carlini]

Hi,

a simple ICE on invalid, 4.7 Regression. Tested x86_64-linux.

Thanks,
Paolo.

//////////////////

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

        PR c++/51399
        * init.c (perform_member_init): Check init for error_mark_node too.

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

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




Index: testsuite/g++.dg/cpp0x/initlist62.C
===================================================================
--- testsuite/g++.dg/cpp0x/initlist62.C (revision 0)
+++ testsuite/g++.dg/cpp0x/initlist62.C (revision 0)
@@ -0,0 +1,10 @@
+// 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() {}                                  // { dg-error "invalid initializer" }
+};
Index: cp/init.c
===================================================================
--- cp/init.c   (revision 182007)
+++ cp/init.c   (working copy)
@@ -616,7 +616,7 @@ perform_member_init (tree member, tree init)
     {
       if (TREE_CODE (type) == ARRAY_TYPE)
        {
-         if (init)
+         if (init && init != error_mark_node)
            {
              if (TREE_CHAIN (init))
                init = error_mark_node;