diff options
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index ac8b5b5..e7abeff 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1193,6 +1193,17 @@ copy_phis_for_bb (basic_block bb, copy_body_data *id) walk_tree (&new_arg, copy_body_r, id, NULL); gcc_assert (new_arg); + /* With return slot optimization we can end up with + non-gimple (foo *)&this->m, fix that here. */ + if (TREE_CODE (new_arg) != SSA_NAME + && TREE_CODE (new_arg) != FUNCTION_DECL + && !is_gimple_val (new_arg)) + { + tree stmts = NULL_TREE; + new_arg = force_gimple_operand (new_arg, &stmts, + true, NULL); + bsi_insert_on_edge_immediate (new_edge, stmts); + } add_phi_arg (new_phi, new_arg, new_edge); } } |