From 3ae9a8b765a5bbcdae187b79eb1f773582b342e1 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 14 Apr 2016 16:14:38 -0400 Subject: [PATCH] re PR c++/70648 (adplug-xmms fails to compile) PR c++/70648 * constexpr.c (cxx_eval_store_expression): Also copy CONSTRUCTOR_NO_IMPLICIT_ZERO. From-SVN: r234989 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/constexpr.c | 2 ++ gcc/testsuite/g++.dg/cpp0x/constexpr-initlist10.C | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-initlist10.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index feb38c2..cba07aa 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-04-14 Jason Merrill + + PR c++/70648 + * constexpr.c (cxx_eval_store_expression): Also copy + CONSTRUCTOR_NO_IMPLICIT_ZERO. + 2016-04-14 Martin Sebor PR c++/69517 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 37cc336..4abff20 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3149,6 +3149,8 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t, CONSTRUCTOR_ELTS (*valp) = CONSTRUCTOR_ELTS (init); TREE_CONSTANT (*valp) = TREE_CONSTANT (init); TREE_SIDE_EFFECTS (*valp) = TREE_SIDE_EFFECTS (init); + CONSTRUCTOR_NO_IMPLICIT_ZERO (*valp) + = CONSTRUCTOR_NO_IMPLICIT_ZERO (init); } else *valp = init; diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist10.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist10.C new file mode 100644 index 0000000..c12347d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist10.C @@ -0,0 +1,11 @@ +// PR c++/70648 +// { dg-do compile { target c++11 } } + +struct C +{ + template + constexpr C (...) : c { static_cast(0)... } {} + int c[1]; +}; + +static constexpr int b = C{}.c[0]; -- 2.7.4