diff options
| author | Jason Merrill <jason@redhat.com> | 2014-06-30 11:11:07 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-06-30 11:11:07 -0400 |
| commit | 71d1add36394c36f3bb59fc3282e65a1e865baa2 (patch) | |
| tree | 84733a69af3d4728e6d40b365425d36bb8c7de1d /gcc | |
| parent | 4f82fed2f6dcef2719103a5fd885f6baf9714ce0 (diff) | |
| download | gcc-71d1add36394c36f3bb59fc3282e65a1e865baa2.zip gcc-71d1add36394c36f3bb59fc3282e65a1e865baa2.tar.gz gcc-71d1add36394c36f3bb59fc3282e65a1e865baa2.tar.bz2 | |
semantics.c (simplify_aggr_init_expr): Remove remnants of 2014-04-11 change.
* semantics.c (simplify_aggr_init_expr): Remove remnants of
2014-04-11 change.
From-SVN: r212153
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6d5b43f..b478cf7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-30 Jason Merrill <jason@redhat.com> + + * semantics.c (simplify_aggr_init_expr): Remove remnants of + 2014-04-11 change. + 2014-06-30 Marek Polacek <polacek@redhat.com> * cp-gimplify.c (cp_genericize): Don't instrument returns if the diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 456df7b..a6f5a4a 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3870,7 +3870,6 @@ simplify_aggr_init_expr (tree *tp) AGGR_INIT_EXPR_ARGP (aggr_init_expr)); TREE_NOTHROW (call_expr) = TREE_NOTHROW (aggr_init_expr); CALL_EXPR_LIST_INIT_P (call_expr) = CALL_EXPR_LIST_INIT_P (aggr_init_expr); - tree ret = call_expr; if (style == ctor) { @@ -3886,7 +3885,7 @@ simplify_aggr_init_expr (tree *tp) expand_call{,_inline}. */ cxx_mark_addressable (slot); CALL_EXPR_RETURN_SLOT_OPT (call_expr) = true; - ret = build2 (INIT_EXPR, TREE_TYPE (ret), slot, ret); + call_expr = build2 (INIT_EXPR, TREE_TYPE (call_expr), slot, call_expr); } else if (style == pcc) { @@ -3894,11 +3893,11 @@ simplify_aggr_init_expr (tree *tp) need to copy the returned value out of the static buffer into the SLOT. */ push_deferring_access_checks (dk_no_check); - ret = build_aggr_init (slot, ret, - DIRECT_BIND | LOOKUP_ONLYCONVERTING, - tf_warning_or_error); + call_expr = build_aggr_init (slot, call_expr, + DIRECT_BIND | LOOKUP_ONLYCONVERTING, + tf_warning_or_error); pop_deferring_access_checks (); - ret = build2 (COMPOUND_EXPR, TREE_TYPE (slot), ret, slot); + call_expr = build2 (COMPOUND_EXPR, TREE_TYPE (slot), call_expr, slot); } if (AGGR_INIT_ZERO_FIRST (aggr_init_expr)) @@ -3906,10 +3905,11 @@ simplify_aggr_init_expr (tree *tp) tree init = build_zero_init (type, NULL_TREE, /*static_storage_p=*/false); init = build2 (INIT_EXPR, void_type_node, slot, init); - ret = build2 (COMPOUND_EXPR, TREE_TYPE (ret), init, ret); + call_expr = build2 (COMPOUND_EXPR, TREE_TYPE (call_expr), + init, call_expr); } - *tp = ret; + *tp = call_expr; } /* Emit all thunks to FN that should be emitted when FN is emitted. */ |