PR c++/69658

	* init.c (expand_default_init): Only call reshape_init
	in the direct-initialization from an initializer list case.

	* g++.dg/init/pr69658.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233435 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 04d55bc..51c99e1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-15  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/69658
+       * init.c (expand_default_init): Only call reshape_init
+       in the direct-initialization from an initializer list case.
+
 2016-02-15  Jason Merrill  <jason@redhat.com>
 
        PR c++/69753

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index f6ceb7f..9f9c729 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1636,16 +1636,17 @@ expand_default_init (tree binfo, tree true_exp, tree exp, tree init, int flags,
       gcc_checking_assert ((flags & LOOKUP_ONLYCONVERTING) == 0
                           && TREE_CHAIN (init) == NULL_TREE);
       init = TREE_VALUE (init);
+      /* Only call reshape_init if it has not been called earlier
+        by the callers.  */
+      if (BRACE_ENCLOSED_INITIALIZER_P (init) && CP_AGGREGATE_TYPE_P (type))
+       init = reshape_init (type, init, complain);
     }
 
   if (init && BRACE_ENCLOSED_INITIALIZER_P (init)
       && CP_AGGREGATE_TYPE_P (type))
     /* A brace-enclosed initializer for an aggregate.  In C++0x this can
        happen for direct-initialization, too.  */
-    {
-      init = reshape_init (type, init, complain);
-      init = digest_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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 21b11e9..8987be1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2016-02-15  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c++/69658
+       * g++.dg/init/pr69658.C: New test.
+
        PR c++/69797
        * c-c++-common/pr69797.c: New test.
 

diff --git a/gcc/testsuite/g++.dg/init/pr69658.C b/gcc/testsuite/g++.dg/init/pr69658.C
new file mode 100644 (file)
index 0000000..976f79d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/pr69658.C
@@ -0,0 +1,6 @@
+// PR c++/69658
+// { dg-do compile }
+
+struct S { S (int); };
+struct T { char n[6]; S s; };
+T t[1] = { { "foo", 1 } };     // { dg-bogus "C99 designator" }