From 4f419f8cdc734f82c04c3bc36659185912458998 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 30 Apr 2014 10:23:11 -0400 Subject: [PATCH] re PR c++/60951 ([C++11] ICE with braced-init-list assignment and constexpr constructor) PR c++/60951 * typeck2.c (massage_init_elt): Use maybe_constant_init. From-SVN: r209933 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/typeck2.c | 2 +- gcc/testsuite/g++.dg/cpp0x/constexpr-aggr1.C | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-aggr1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c4be5bd..a387883 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-30 Jason Merrill + + PR c++/60951 + * typeck2.c (massage_init_elt): Use maybe_constant_init. + 2014-04-30 Marek Polacek * typeck.c (cp_build_binary_op): Call ubsan_instrument_division diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 5bbc2ef..044d971 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1138,7 +1138,7 @@ massage_init_elt (tree type, tree init, tsubst_flags_t complain) /* When we defer constant folding within a statement, we may want to defer this folding as well. */ tree t = fold_non_dependent_expr_sfinae (init, complain); - t = maybe_constant_value (t); + t = maybe_constant_init (t); if (TREE_CONSTANT (t)) init = t; return init; diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-aggr1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-aggr1.C new file mode 100644 index 0000000..7e4da11 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-aggr1.C @@ -0,0 +1,17 @@ +// PR c++/60951 +// { dg-do compile { target c++11 } } + +struct Foo { + constexpr Foo(int x = 0) : memb(x) {} + int memb; +}; + +struct FooContainer { + Foo foo[2]; +}; + +void fubar() { + int nonConst = 0; + FooContainer fooContainer; + fooContainer = { { 0, nonConst } }; +} -- 2.7.4