[C++ Patch] PR 65815

[Paolo Carlini]

Hi again,

On 06/08/2015 10:33 PM, Paolo Carlini wrote:
>> Could you also check that we do the right thing for mem-initializers?
> Sure I will.
I think we have a similar issue in expand_default_init: exactly when 
reshape_init is in order we fail to call it before digest_init. The 
below also passes testing.

Thanks!
Paolo.

////////////////
-------------- next part --------------
Index: cp/init.c
===================================================================
--- cp/init.c	(revision 224234)
+++ cp/init.c	(working copy)
@@ -1617,7 +1617,10 @@ expand_default_init (tree binfo, tree true_exp, tr
       && CP_AGGREGATE_TYPE_P (type))
     /* A brace-enclosed initializer for an aggregate.  In C++0x this can
        happen for direct-initialization, too.  */
-    init = digest_init (type, init, complain);
+    {
+      init = reshape_init (type, init, complain);
+      init = digest_init (type, init, complain);
+    }
 
   /* A CONSTRUCTOR of the target's type is a previously digested
      initializer, whether that happened just above or in
Index: cp/typeck2.c
===================================================================
--- cp/typeck2.c	(revision 224234)
+++ cp/typeck2.c	(working copy)
@@ -1161,10 +1161,14 @@ digest_nsdmi_init (tree decl, tree init)
 {
   gcc_assert (TREE_CODE (decl) == FIELD_DECL);
 
+  tree type = TREE_TYPE (decl);
   int flags = LOOKUP_IMPLICIT;
   if (DIRECT_LIST_INIT_P (init))
     flags = LOOKUP_NORMAL;
-  init = digest_init_flags (TREE_TYPE (decl), init, flags);
+  if (BRACE_ENCLOSED_INITIALIZER_P (init)
+      && CP_AGGREGATE_TYPE_P (type))
+    init = reshape_init (type, init, tf_warning_or_error);
+  init = digest_init_flags (type, init, flags);
   if (TREE_CODE (init) == TARGET_EXPR)
     /* This represents the whole initialization.  */
     TARGET_EXPR_DIRECT_INIT_P (init) = true;
Index: testsuite/g++.dg/cpp0x/mem-init-aggr1.C
===================================================================
--- testsuite/g++.dg/cpp0x/mem-init-aggr1.C	(revision 0)
+++ testsuite/g++.dg/cpp0x/mem-init-aggr1.C	(working copy)
@@ -0,0 +1,10 @@
+// PR c++/65815
+// { dg-do compile { target c++11 } }
+
+struct array {
+  int data [2];
+};
+
+struct X : array {
+  X() : array{ 1, 2 } { }
+};
Index: testsuite/g++.dg/cpp0x/nsdmi-aggr1.C
===================================================================
--- testsuite/g++.dg/cpp0x/nsdmi-aggr1.C	(revision 0)
+++ testsuite/g++.dg/cpp0x/nsdmi-aggr1.C	(working copy)
@@ -0,0 +1,10 @@
+// PR c++/65815
+// { dg-do compile { target c++11 } }
+
+struct array {
+  int data [2];
+};
+
+struct X {
+  array a = { 1, 2 };
+};