diff options
| author | Jason Merrill <jason@redhat.com> | 2010-11-03 22:15:08 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-11-03 22:15:08 -0400 |
| commit | dafed7ca0bdb906406efdd84256e1cebde06b94e (patch) | |
| tree | 8991911a4ae81fbf5019da8a4b437a3e44e2a825 | |
| parent | bc99421e351e6f3ed3c8b5681179cd76d5f2862f (diff) | |
| download | gcc-dafed7ca0bdb906406efdd84256e1cebde06b94e.zip gcc-dafed7ca0bdb906406efdd84256e1cebde06b94e.tar.gz gcc-dafed7ca0bdb906406efdd84256e1cebde06b94e.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C | 19 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e384cf7..c432ca8 100644 --- 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 562fab1..9061a89 100644 --- 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 0597d47..cc63852 100644 --- 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 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{}; |