This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH][6/n] Remove mark_symbols_for_renaming
- From: Richard Guenther <rguenther at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 16 May 2012 15:35:34 +0200 (CEST)
- Subject: [PATCH][6/n] Remove mark_symbols_for_renaming
This tackles the remaining caller of mark_symbols_for_renaming, the
inliner. Incrementally as it's a mess ;)
Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk.
Richard.
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.
Index: gcc/tree-inline.c
===================================================================
*** gcc/tree-inline.c (revision 187585)
--- gcc/tree-inline.c (working copy)
*************** insert_init_stmt (copy_body_data *id, ba
*** 2542,2548 ****
}
gsi_insert_after (&si, init_stmt, GSI_NEW_STMT);
gimple_regimplify_operands (init_stmt, &si);
- mark_symbols_for_renaming (init_stmt);
if (!is_gimple_debug (init_stmt) && MAY_HAVE_DEBUG_STMTS)
{
--- 2551,2556 ----
*************** setup_one_parameter (copy_body_data *id,
*** 2707,2720 ****
STRIP_USELESS_TYPE_CONVERSION (rhs);
! /* We want to use MODIFY_EXPR, not INIT_EXPR here so that we
! keep our trees in gimple form. */
! if (def && gimple_in_ssa_p (cfun) && is_gimple_reg (p))
! {
! def = remap_ssa_name (def, id);
! init_stmt = gimple_build_assign (def, rhs);
! SSA_NAME_IS_DEFAULT_DEF (def) = 0;
! set_default_def (var, NULL);
}
else
init_stmt = gimple_build_assign (var, rhs);
--- 2715,2731 ----
STRIP_USELESS_TYPE_CONVERSION (rhs);
! /* If we are in SSA form properly remap the default definition
! or omit the initialization if the parameter is unused. */
! if (gimple_in_ssa_p (cfun) && is_gimple_reg (p))
! {
! if (def)
! {
! def = remap_ssa_name (def, id);
! init_stmt = gimple_build_assign (def, rhs);
! SSA_NAME_IS_DEFAULT_DEF (def) = 0;
! set_default_def (var, NULL);
! }
}
else
init_stmt = gimple_build_assign (var, rhs);
*************** declare_return_variable (copy_body_data
*** 2974,2983 ****
if (gimple_in_ssa_p (id->src_cfun))
add_referenced_var (temp);
insert_decl_map (id, result, temp);
! /* When RESULT_DECL is in SSA form, we need to use it's default_def
! SSA_NAME. */
! if (gimple_in_ssa_p (id->src_cfun) && gimple_default_def (id->src_cfun, result))
! temp = remap_ssa_name (gimple_default_def (id->src_cfun, result), id);
insert_init_stmt (id, entry_bb, gimple_build_assign (temp, var));
}
else
--- 2985,2999 ----
if (gimple_in_ssa_p (id->src_cfun))
add_referenced_var (temp);
insert_decl_map (id, result, temp);
! /* When RESULT_DECL is in SSA form, we need to remap and initialize
! it's default_def SSA_NAME. */
! if (gimple_in_ssa_p (id->src_cfun)
! && 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));
}
else