PR c++/72457 - ICE with list-value-initialized base.

	* init.c (expand_aggr_init_1): Only handle value-init of bases.
	* constexpr.c (build_data_member_initialization): Handle multiple
	initializers for the same field.

From-SVN: r238867

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cf692c9fbc6cb0502e4355aea35d6f74a5cdfe72..62c6e53b99a25c179e50c58d1b0a0680a0049c77 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2016-07-29  Jason Merrill  <jason@redhat.com>
+
+       PR c++/72457
+       * init.c (expand_aggr_init_1): Only handle value-init of bases.
+       * constexpr.c (build_data_member_initialization): Handle multiple
+       initializers for the same field.
+
 2016-07-28  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/71665

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 6bcb41ae8254b70eae841085362184a998ed95aa..58716892f716770eb6fb074ed73562f9672b07e0 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -391,7 +391,12 @@ build_data_member_initialization (tree t, vec<constructor_elt, va_gc> **vec)
        gcc_assert (TREE_TYPE (member) == vtbl_ptr_type_node);
     }
 
-  CONSTRUCTOR_APPEND_ELT (*vec, member, init);
+  /* Value-initialization can produce multiple initializers for the
+     same field; use the last one.  */
+  if (!vec_safe_is_empty (*vec) && (*vec)->last().index == member)
+    (*vec)->last().value = init;
+  else
+    CONSTRUCTOR_APPEND_ELT (*vec, member, init);
   return true;
 }
 

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 636226359833309a9dce871707c795090e34741e..1a5766a42b7734fe3ea493cdc0500c63eac466e7 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1818,9 +1818,9 @@ expand_aggr_init_1 (tree binfo, tree true_exp, tree exp, tree init, int flags,
     }
 
   /* List-initialization from {} becomes value-initialization for non-aggregate
-     classes with default constructors.  Handle this here so protected access
-     works.  */
-  if (init && TREE_CODE (init) == TREE_LIST)
+     classes with default constructors.  Handle this here when we're
+     initializing a base, so protected access works.  */
+  if (exp != true_exp && init && TREE_CODE (init) == TREE_LIST)
     {
       tree elt = TREE_VALUE (init);
       if (DIRECT_LIST_INIT_P (elt)

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-list1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-list1.C
new file mode 100644 (file)
index 0000000..f831a11
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-list1.C
@@ -0,0 +1,15 @@
+// PR c++/72457
+// { dg-do compile { target c++11 } }
+
+struct A {
+  int i;
+  constexpr A(): i(0) {}
+};
+
+struct B: A { };
+
+struct C
+{
+  B b;
+  constexpr C() : b{} {}
+};