re PR c++/46293 (constexpr vs. tuple, ice)

	PR c++/46293
	* semantics.c (build_data_member_initialization): Handle
	value-init of aggregate empty base.

From-SVN: r166297

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e384cf7991e78b4472cbc1b0b220b5f16033614a..c432ca8150c9fea2dcacbc8b3fde4c38b496d0e2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2010-11-03  Jason Merrill  <jason@redhat.com>
 
+       PR c++/46293
+       * semantics.c (build_data_member_initialization): Handle
+       value-init of aggregate empty base.
+
        PR c++/46289
        * call.c (can_convert_array): New fn.
        (build_aggr_conv): Use it.

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 562fab14d6b5b11a35df546def6fc89bd918ae2a..9061a89ed245de6ae580d064d680e4ee90542c8e 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5460,6 +5460,14 @@ build_data_member_initialization (tree t, VEC(constructor_elt,gc) **vec)
     {
       member = TREE_OPERAND (t, 0);
       init = unshare_expr (TREE_OPERAND (t, 1));
+      if (TREE_CODE (member) == INDIRECT_REF)
+       {
+         /* Don't put out anything for value-init of an empty base.  */
+         gcc_assert (is_empty_class (TREE_TYPE (member)));
+         gcc_assert (TREE_CODE (init) == CONSTRUCTOR
+                     && CONSTRUCTOR_NELTS (init) == 0);
+         return true;
+       }
     }
   else
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0597d4718dc48ad5d7eef1aaa44201959ecf4264..cc638523b974933b218210cffc65004237ed9cef 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-03  Jason Merrill  <jason@redhat.com>
 
+       PR c++/46293
+       * g++.dg/cpp0x/constexpr-base2.C: New.
+
        PR c++/46289
        * g++.dg/cpp0x/initlist45.C: New.
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C
new file mode 100644 (file)
index 0000000..3ea7543
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C
@@ -0,0 +1,19 @@
+// PR c++/46293
+// { dg-options -std=c++0x }
+
+struct A
+{
+};
+
+struct C
+{
+  int i;
+  constexpr C(int i): i(i) {}
+};
+
+struct B: A, C
+{
+  constexpr B(): A(), C(42) { }
+};
+
+constexpr B b{};