Commit 6b18b1a3 by Richard Guenther Committed by Richard Biener

tree-inline.c (insert_init_stmt): Do not call mark_symbols_for_renaming.

2012-05-16  Richard Guenther  <rguenther@suse.de>

	* tree-inline.c (insert_init_stmt): Do not call
	mark_symbols_for_renaming.
	(setup_one_parameter): Avoid initializing unused parameters.
	(declare_return_variable): Properly handle DECL_BY_REFERENCE
	return vars in SSA form.

From-SVN: r187593
parent 00d9266f
2012-05-16 Richard Guenther <rguenther@suse.de> 2012-05-16 Richard Guenther <rguenther@suse.de>
* tree-inline.c (insert_init_stmt): Do not call
mark_symbols_for_renaming.
(setup_one_parameter): Avoid initializing unused parameters.
(declare_return_variable): Properly handle DECL_BY_REFERENCE
return vars in SSA form.
2012-05-16 Richard Guenther <rguenther@suse.de>
* tree-flow.h (get_virtual_var): Remove. * tree-flow.h (get_virtual_var): Remove.
* tree-dfa.c (get_virtual_var): Likewise. * tree-dfa.c (get_virtual_var): Likewise.
......
...@@ -2542,7 +2542,6 @@ insert_init_stmt (copy_body_data *id, basic_block bb, gimple init_stmt) ...@@ -2542,7 +2542,6 @@ insert_init_stmt (copy_body_data *id, basic_block bb, gimple init_stmt)
} }
gsi_insert_after (&si, init_stmt, GSI_NEW_STMT); gsi_insert_after (&si, init_stmt, GSI_NEW_STMT);
gimple_regimplify_operands (init_stmt, &si); gimple_regimplify_operands (init_stmt, &si);
mark_symbols_for_renaming (init_stmt);
if (!is_gimple_debug (init_stmt) && MAY_HAVE_DEBUG_STMTS) if (!is_gimple_debug (init_stmt) && MAY_HAVE_DEBUG_STMTS)
{ {
...@@ -2707,14 +2706,17 @@ setup_one_parameter (copy_body_data *id, tree p, tree value, tree fn, ...@@ -2707,14 +2706,17 @@ setup_one_parameter (copy_body_data *id, tree p, tree value, tree fn,
STRIP_USELESS_TYPE_CONVERSION (rhs); STRIP_USELESS_TYPE_CONVERSION (rhs);
/* We want to use MODIFY_EXPR, not INIT_EXPR here so that we /* If we are in SSA form properly remap the default definition
keep our trees in gimple form. */ or omit the initialization if the parameter is unused. */
if (def && gimple_in_ssa_p (cfun) && is_gimple_reg (p)) if (gimple_in_ssa_p (cfun) && is_gimple_reg (p))
{ {
def = remap_ssa_name (def, id); if (def)
init_stmt = gimple_build_assign (def, rhs); {
SSA_NAME_IS_DEFAULT_DEF (def) = 0; def = remap_ssa_name (def, id);
set_default_def (var, NULL); init_stmt = gimple_build_assign (def, rhs);
SSA_NAME_IS_DEFAULT_DEF (def) = 0;
set_default_def (var, NULL);
}
} }
else else
init_stmt = gimple_build_assign (var, rhs); init_stmt = gimple_build_assign (var, rhs);
...@@ -2974,10 +2976,15 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest, ...@@ -2974,10 +2976,15 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest,
if (gimple_in_ssa_p (id->src_cfun)) if (gimple_in_ssa_p (id->src_cfun))
add_referenced_var (temp); add_referenced_var (temp);
insert_decl_map (id, result, temp); insert_decl_map (id, result, temp);
/* When RESULT_DECL is in SSA form, we need to use it's default_def /* When RESULT_DECL is in SSA form, we need to remap and initialize
SSA_NAME. */ it's default_def SSA_NAME. */
if (gimple_in_ssa_p (id->src_cfun) && gimple_default_def (id->src_cfun, result)) if (gimple_in_ssa_p (id->src_cfun)
temp = remap_ssa_name (gimple_default_def (id->src_cfun, result), id); && is_gimple_reg (result))
{
temp = make_ssa_name (temp, NULL);
insert_decl_map (id, gimple_default_def (id->src_cfun, result),
temp);
}
insert_init_stmt (id, entry_bb, gimple_build_assign (temp, var)); insert_init_stmt (id, entry_bb, gimple_build_assign (temp, var));
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment