diff options
Diffstat (limited to 'gcc/cp/constexpr.c')
| -rw-r--r-- | gcc/cp/constexpr.c | 18 |
1 files changed, 14 insertions, 4 deletions
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; |