diff options
| author | Jason Merrill <jason@redhat.com> | 2015-06-11 11:45:01 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-06-11 11:45:01 -0400 |
| commit | acb2970c3bdf4cfd81954278d28f53adcffab99c (patch) | |
| tree | 71a96b0f5f11e1781ea2e76086cf3e229938292d | |
| parent | 881a5e608a945bebcfbefcf8c521a2e481610789 (diff) | |
| download | gcc-acb2970c3bdf4cfd81954278d28f53adcffab99c.zip gcc-acb2970c3bdf4cfd81954278d28f53adcffab99c.tar.gz gcc-acb2970c3bdf4cfd81954278d28f53adcffab99c.tar.bz2 | |
re PR c++/66450 ([C++11][constexpr] Issues when delegating implicit copy constructor in constexpr function)
PR c++/66450
* constexpr.c (cxx_eval_store_expression): Avoid messing up outer
ctx->ctor.
From-SVN: r224381
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 18 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-fwctor1.C | 19 |
3 files changed, 39 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a3dd1db..b6fdc10 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-06-11 Jason Merrill <jason@redhat.com> + + PR c++/66450 + * constexpr.c (cxx_eval_store_expression): Avoid messing up outer + ctx->ctor. + 2015-06-10 Jason Merrill <jason@redhat.com> PR c++/66289 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 8fa2eb3..af6b39e 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -2671,11 +2671,13 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t, } release_tree_vector (refs); - if ((AGGREGATE_TYPE_P (TREE_TYPE (t)) || VECTOR_TYPE_P (TREE_TYPE (t)))) + if (AGGREGATE_TYPE_P (type) || VECTOR_TYPE_P (type)) { /* Create a new CONSTRUCTOR in case evaluation of the initializer wants to modify it. */ - *valp = new_ctx.ctor = build_constructor (TREE_TYPE (t), NULL); + new_ctx.ctor = build_constructor (type, NULL); + if (*valp == NULL_TREE) + *valp = new_ctx.ctor; CONSTRUCTOR_NO_IMPLICIT_ZERO (new_ctx.ctor) = true; new_ctx.object = target; } @@ -2683,8 +2685,16 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t, init = cxx_eval_constant_expression (&new_ctx, init, false, non_constant_p, overflow_p); if (target == object) - /* The hash table might have moved since the get earlier. */ - ctx->values->put (object, init); + { + /* The hash table might have moved since the get earlier. */ + valp = ctx->values->get (object); + if (TREE_CODE (init) == CONSTRUCTOR) + /* An outer ctx->ctor might be pointing to *valp, so just replace + its contents. */ + CONSTRUCTOR_ELTS (*valp) = CONSTRUCTOR_ELTS (init); + else + *valp = init; + } else *valp = init; diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-fwctor1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-fwctor1.C new file mode 100644 index 0000000..d25c9c7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-fwctor1.C @@ -0,0 +1,19 @@ +// PR c++/66450 +// { dg-do compile { target c++11 } } + +struct foo { + constexpr foo(int a); + constexpr foo(int a, int b, int c): a{a}, b{b}, c{c} {} + + int a, b, c; +}; + +constexpr foo make_foo(int a) { return foo{a, a+1, a+2}; } +constexpr foo::foo(int a): foo{make_foo(a)} {} + +int main() { + constexpr const foo f{3}; + static_assert(f.a == 3, ""); + static_assert(f.b == 4, ""); + static_assert(f.c == 5, ""); +} |