diff options
| author | Jason Merrill <jason@redhat.com> | 2016-02-18 00:08:02 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-02-18 00:08:02 -0500 |
| commit | bcb5f3c9f5aa8d3368e887b40f4ab1197afab59e (patch) | |
| tree | 3a28b389f9378d4f0f01d9a0a5b4449ab92f5e94 /gcc | |
| parent | 50ccdf5bc28a9c14b73fc7b6c6fedb81e0d0f987 (diff) | |
| download | gcc-bcb5f3c9f5aa8d3368e887b40f4ab1197afab59e.zip gcc-bcb5f3c9f5aa8d3368e887b40f4ab1197afab59e.tar.gz gcc-bcb5f3c9f5aa8d3368e887b40f4ab1197afab59e.tar.bz2 | |
re PR c++/68585 (c++14 code accepted by 4.9 not accepted by 5 and 6)
PR c++/68585
* constexpr.c (cxx_eval_bare_aggregate): Fix 'changed' detection.
From-SVN: r233513
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-initlist9.C | 41 |
3 files changed, 46 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c560375..963ba5a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2016-02-17 Jason Merrill <jason@redhat.com> + PR c++/68585 + * constexpr.c (cxx_eval_bare_aggregate): Fix 'changed' detection. + PR c++/68679 * decl2.c (reset_type_linkage_2): Look through member templates. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 11037fb..0eedfca 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -2234,6 +2234,7 @@ cxx_eval_bare_aggregate (const constexpr_ctx *ctx, tree t, bool side_effects_p = false; FOR_EACH_CONSTRUCTOR_ELT (v, i, index, value) { + tree orig_value = value; constexpr_ctx new_ctx; init_subob_ctx (ctx, new_ctx, index, value); if (new_ctx.ctor != ctx->ctor) @@ -2246,7 +2247,7 @@ cxx_eval_bare_aggregate (const constexpr_ctx *ctx, tree t, /* Don't VERIFY_CONSTANT here. */ if (ctx->quiet && *non_constant_p) break; - if (elt != value) + if (elt != orig_value) changed = true; if (!TREE_CONSTANT (elt)) diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist9.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist9.C new file mode 100644 index 0000000..239b91e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist9.C @@ -0,0 +1,41 @@ +// PR c++/68585 +// { dg-do compile { target c++11 } } + +template<typename T, unsigned N> + struct array + { + T _M_data[N]; + }; + +template<typename _Tp, _Tp... _Idx> + struct integer_sequence + { + }; + +struct Pos +{ + unsigned l; +}; + +template<class T, T... Ints> +constexpr array<Pos, sizeof...(Ints)> make_grid_position(integer_sequence<T, Ints...>) +{ + return {{ Pos{Ints}... }}; +} + +constexpr array<Pos, 1> make_grid_positions() +{ + return make_grid_position(integer_sequence<unsigned, 0>{}); +} + +template<class T> +void generate_sudoku(T) +{ + constexpr auto positions = make_grid_positions(); // fail +} + +int main() +{ + constexpr auto positions = make_grid_positions(); // ok + generate_sudoku(1); +} |