tree-flow.h (make_rename_temp): Remove.
2012-08-02 Richard Guenther <rguenther@suse.de> * tree-flow.h (make_rename_temp): Remove. * tree-dfa.c (make_rename_temp): Likewise. * cgraphunit.c (thunk_adjust, assemble_thunk): Use create_tmp_reg instead of make_rename_temp. * omp-low.c (expand_omp_for_generic, expand_omp_for_static_nochunk, expand_omp_atomic_pipeline): Likewise. * trans-mem.c (tm_log_emit_save_or_restores, build_tm_load, build_tm_store, expand_call_tm, expand_transaction, ipa_tm_insert_gettmclone_call): Likewise. * tree-complex.c (expand_complex_div_wide): Likewise. * tree-mudflap.c (mf_decl_cache_locals, mf_build_check_statement_for): Likewise. * tree-ssa-loop-im.c (execute_sm_if_changed_flag_set, execute_sm): Likewise. * tree-ssa-math-opts.c (insert_reciprocals): Likewise. * value-prof.c (gimple_divmod_fixed_value, gimple_mod_pow2, gimple_mod_subtract): Likewise. From-SVN: r190074
This commit is contained in:
Richard Guenther
Richard Biener
parent
322445530d
commit
7cc434a3c1
11 changed files with 53 additions and 42 deletions
|
|
@ -1,3 +1,23 @@
|
|||
2012-08-02 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
* tree-flow.h (make_rename_temp): Remove.
|
||||
* tree-dfa.c (make_rename_temp): Likewise.
|
||||
* cgraphunit.c (thunk_adjust, assemble_thunk): Use create_tmp_reg
|
||||
instead of make_rename_temp.
|
||||
* omp-low.c (expand_omp_for_generic, expand_omp_for_static_nochunk,
|
||||
expand_omp_atomic_pipeline): Likewise.
|
||||
* trans-mem.c (tm_log_emit_save_or_restores, build_tm_load,
|
||||
build_tm_store, expand_call_tm, expand_transaction,
|
||||
ipa_tm_insert_gettmclone_call): Likewise.
|
||||
* tree-complex.c (expand_complex_div_wide): Likewise.
|
||||
* tree-mudflap.c (mf_decl_cache_locals, mf_build_check_statement_for):
|
||||
Likewise.
|
||||
* tree-ssa-loop-im.c (execute_sm_if_changed_flag_set, execute_sm):
|
||||
Likewise.
|
||||
* tree-ssa-math-opts.c (insert_reciprocals): Likewise.
|
||||
* value-prof.c (gimple_divmod_fixed_value, gimple_mod_pow2,
|
||||
gimple_mod_subtract): Likewise.
|
||||
|
||||
2012-08-02 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
* tree-flow.h (set_default_def): Rename to ...
|
||||
|
|
|
|||
|
|
@ -1280,7 +1280,7 @@ thunk_adjust (gimple_stmt_iterator * bsi,
|
|||
}
|
||||
|
||||
vtabletmp =
|
||||
make_rename_temp (build_pointer_type
|
||||
create_tmp_reg (build_pointer_type
|
||||
(build_pointer_type (vtable_entry_type)), "vptr");
|
||||
|
||||
/* The vptr is always at offset zero in the object. */
|
||||
|
|
@ -1290,7 +1290,7 @@ thunk_adjust (gimple_stmt_iterator * bsi,
|
|||
gsi_insert_after (bsi, stmt, GSI_NEW_STMT);
|
||||
|
||||
/* Form the vtable address. */
|
||||
vtabletmp2 = make_rename_temp (TREE_TYPE (TREE_TYPE (vtabletmp)),
|
||||
vtabletmp2 = create_tmp_reg (TREE_TYPE (TREE_TYPE (vtabletmp)),
|
||||
"vtableaddr");
|
||||
stmt = gimple_build_assign (vtabletmp2,
|
||||
build_simple_mem_ref (vtabletmp));
|
||||
|
|
@ -1304,7 +1304,7 @@ thunk_adjust (gimple_stmt_iterator * bsi,
|
|||
gsi_insert_after (bsi, stmt, GSI_NEW_STMT);
|
||||
|
||||
/* Get the offset itself. */
|
||||
vtabletmp3 = make_rename_temp (TREE_TYPE (TREE_TYPE (vtabletmp2)),
|
||||
vtabletmp3 = create_tmp_reg (TREE_TYPE (TREE_TYPE (vtabletmp2)),
|
||||
"vcalloffset");
|
||||
stmt = gimple_build_assign (vtabletmp3,
|
||||
build_simple_mem_ref (vtabletmp2));
|
||||
|
|
@ -1326,7 +1326,7 @@ thunk_adjust (gimple_stmt_iterator * bsi,
|
|||
ptrtmp = ptr;
|
||||
else
|
||||
{
|
||||
ptrtmp = make_rename_temp (TREE_TYPE (ptr), "ptr");
|
||||
ptrtmp = create_tmp_reg (TREE_TYPE (ptr), "ptr");
|
||||
stmt = gimple_build_assign (ptrtmp, ptr);
|
||||
gsi_insert_after (bsi, stmt, GSI_NEW_STMT);
|
||||
}
|
||||
|
|
@ -1335,7 +1335,7 @@ thunk_adjust (gimple_stmt_iterator * bsi,
|
|||
}
|
||||
|
||||
/* Emit the statement and gimplify the adjustment expression. */
|
||||
ret = make_rename_temp (TREE_TYPE (ptr), "adjusted_this");
|
||||
ret = create_tmp_reg (TREE_TYPE (ptr), "adjusted_this");
|
||||
stmt = gimple_build_assign (ret, ptr);
|
||||
gsi_insert_after (bsi, stmt, GSI_NEW_STMT);
|
||||
|
||||
|
|
@ -1440,7 +1440,7 @@ assemble_thunk (struct cgraph_node *node)
|
|||
BLOCK_VARS (DECL_INITIAL (current_function_decl)) = restmp;
|
||||
}
|
||||
else
|
||||
restmp = make_rename_temp (restype, "retval");
|
||||
restmp = create_tmp_reg (restype, "retval");
|
||||
}
|
||||
|
||||
for (arg = a; arg; arg = DECL_CHAIN (arg))
|
||||
|
|
|
|||
|
|
@ -3811,7 +3811,7 @@ expand_omp_for_generic (struct omp_region *region,
|
|||
counts[i] = t;
|
||||
else
|
||||
{
|
||||
counts[i] = make_rename_temp (type, ".count");
|
||||
counts[i] = create_tmp_reg (type, ".count");
|
||||
t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE,
|
||||
true, GSI_SAME_STMT);
|
||||
stmt = gimple_build_assign (counts[i], t);
|
||||
|
|
@ -3936,7 +3936,7 @@ expand_omp_for_generic (struct omp_region *region,
|
|||
false, GSI_CONTINUE_LINKING);
|
||||
if (fd->collapse > 1)
|
||||
{
|
||||
tree tem = make_rename_temp (type, ".tem");
|
||||
tree tem = create_tmp_reg (type, ".tem");
|
||||
stmt = gimple_build_assign (tem, fd->loop.v);
|
||||
gsi_insert_after (&gsi, stmt, GSI_CONTINUE_LINKING);
|
||||
for (i = fd->collapse - 1; i >= 0; i--)
|
||||
|
|
@ -4224,12 +4224,12 @@ expand_omp_for_static_nochunk (struct omp_region *region,
|
|||
t = fold_convert (itype, t);
|
||||
n = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true, GSI_SAME_STMT);
|
||||
|
||||
q = make_rename_temp (itype, "q");
|
||||
q = create_tmp_reg (itype, "q");
|
||||
t = fold_build2 (TRUNC_DIV_EXPR, itype, n, nthreads);
|
||||
t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE, true, GSI_SAME_STMT);
|
||||
gsi_insert_before (&gsi, gimple_build_assign (q, t), GSI_SAME_STMT);
|
||||
|
||||
tt = make_rename_temp (itype, "tt");
|
||||
tt = create_tmp_reg (itype, "tt");
|
||||
t = fold_build2 (TRUNC_MOD_EXPR, itype, n, nthreads);
|
||||
t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE, true, GSI_SAME_STMT);
|
||||
gsi_insert_before (&gsi, gimple_build_assign (tt, t), GSI_SAME_STMT);
|
||||
|
|
@ -5289,8 +5289,8 @@ expand_omp_atomic_pipeline (basic_block load_bb, basic_block store_bb,
|
|||
{
|
||||
tree iaddr_val;
|
||||
|
||||
iaddr = make_rename_temp (build_pointer_type_for_mode (itype, ptr_mode,
|
||||
true), NULL);
|
||||
iaddr = create_tmp_reg (build_pointer_type_for_mode (itype, ptr_mode,
|
||||
true), NULL);
|
||||
iaddr_val
|
||||
= force_gimple_operand_gsi (&si,
|
||||
fold_convert (TREE_TYPE (iaddr), addr),
|
||||
|
|
|
|||
|
|
@ -1285,7 +1285,7 @@ tm_log_emit_save_or_restores (basic_block entry_block,
|
|||
gsi = gsi_last_bb (cond_bb);
|
||||
|
||||
/* t1 = status & A_{property}. */
|
||||
t1 = make_rename_temp (TREE_TYPE (status), NULL);
|
||||
t1 = create_tmp_reg (TREE_TYPE (status), NULL);
|
||||
t2 = build_int_cst (TREE_TYPE (status), trxn_prop);
|
||||
stmt = gimple_build_assign_with_ops (BIT_AND_EXPR, t1, status, t2);
|
||||
gsi_insert_after (&gsi, stmt, GSI_CONTINUE_LINKING);
|
||||
|
|
@ -2057,7 +2057,7 @@ build_tm_load (location_t loc, tree lhs, tree rhs, gimple_stmt_iterator *gsi)
|
|||
gimple g;
|
||||
tree temp;
|
||||
|
||||
temp = make_rename_temp (t, NULL);
|
||||
temp = create_tmp_reg (t, NULL);
|
||||
gimple_call_set_lhs (gcall, temp);
|
||||
gsi_insert_before (gsi, gcall, GSI_SAME_STMT);
|
||||
|
||||
|
|
@ -2135,7 +2135,7 @@ build_tm_store (location_t loc, tree lhs, tree rhs, gimple_stmt_iterator *gsi)
|
|||
gimple g;
|
||||
tree temp;
|
||||
|
||||
temp = make_rename_temp (simple_type, NULL);
|
||||
temp = create_tmp_reg (simple_type, NULL);
|
||||
t = fold_build1 (VIEW_CONVERT_EXPR, simple_type, rhs);
|
||||
g = gimple_build_assign (temp, t);
|
||||
gimple_set_location (g, loc);
|
||||
|
|
@ -2302,7 +2302,7 @@ expand_call_tm (struct tm_region *region,
|
|||
if (lhs && requires_barrier (region->entry_block, lhs, stmt)
|
||||
&& !gimple_call_return_slot_opt_p (stmt))
|
||||
{
|
||||
tree tmp = make_rename_temp (TREE_TYPE (lhs), NULL);
|
||||
tree tmp = create_tmp_reg (TREE_TYPE (lhs), NULL);
|
||||
location_t loc = gimple_location (stmt);
|
||||
edge fallthru_edge = NULL;
|
||||
|
||||
|
|
@ -2638,7 +2638,7 @@ expand_transaction (struct tm_region *region)
|
|||
int flags, subcode;
|
||||
|
||||
tm_start = builtin_decl_explicit (BUILT_IN_TM_START);
|
||||
status = make_rename_temp (TREE_TYPE (TREE_TYPE (tm_start)), "tm_state");
|
||||
status = create_tmp_reg (TREE_TYPE (TREE_TYPE (tm_start)), "tm_state");
|
||||
|
||||
/* ??? There are plenty of bits here we're not computing. */
|
||||
subcode = gimple_transaction_subcode (region->transaction_stmt);
|
||||
|
|
@ -2695,7 +2695,7 @@ expand_transaction (struct tm_region *region)
|
|||
region->entry_block = test_bb;
|
||||
gsi = gsi_last_bb (test_bb);
|
||||
|
||||
t1 = make_rename_temp (TREE_TYPE (status), NULL);
|
||||
t1 = create_tmp_reg (TREE_TYPE (status), NULL);
|
||||
t2 = build_int_cst (TREE_TYPE (status), A_ABORTTRANSACTION);
|
||||
g = gimple_build_assign_with_ops (BIT_AND_EXPR, t1, status, t2);
|
||||
gsi_insert_after (&gsi, g, GSI_CONTINUE_LINKING);
|
||||
|
|
@ -4499,7 +4499,7 @@ ipa_tm_insert_gettmclone_call (struct cgraph_node *node,
|
|||
{
|
||||
tree temp;
|
||||
|
||||
temp = make_rename_temp (rettype, 0);
|
||||
temp = create_tmp_reg (rettype, 0);
|
||||
gimple_call_set_lhs (stmt, temp);
|
||||
|
||||
g2 = gimple_build_assign (lhs,
|
||||
|
|
|
|||
|
|
@ -1155,8 +1155,8 @@ expand_complex_div_wide (gimple_stmt_iterator *gsi, tree inner_type,
|
|||
set_immediate_dominator (CDI_DOMINATORS, bb_false, bb_cond);
|
||||
}
|
||||
|
||||
rr = make_rename_temp (inner_type, NULL);
|
||||
ri = make_rename_temp (inner_type, NULL);
|
||||
rr = create_tmp_reg (inner_type, NULL);
|
||||
ri = create_tmp_reg (inner_type, NULL);
|
||||
}
|
||||
|
||||
/* In the TRUE branch, we compute
|
||||
|
|
|
|||
|
|
@ -114,14 +114,6 @@ renumber_gimple_stmt_uids_in_blocks (basic_block *blocks, int n_blocks)
|
|||
}
|
||||
}
|
||||
|
||||
/* Build a temporary. Make sure and register it to be renamed. */
|
||||
|
||||
tree
|
||||
make_rename_temp (tree type, const char *prefix)
|
||||
{
|
||||
return create_tmp_reg (type, prefix);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -444,7 +444,6 @@ extern void dump_dfa_stats (FILE *);
|
|||
extern void debug_dfa_stats (void);
|
||||
extern void dump_variable (FILE *, tree);
|
||||
extern void debug_variable (tree);
|
||||
extern tree make_rename_temp (tree, const char *);
|
||||
extern void set_ssa_default_def (struct function *, tree, tree);
|
||||
extern tree ssa_default_def (struct function *, tree);
|
||||
extern tree get_or_create_ssa_default_def (struct function *, tree);
|
||||
|
|
|
|||
|
|
@ -471,11 +471,11 @@ mf_decl_cache_locals (void)
|
|||
|
||||
/* Build the cache vars. */
|
||||
mf_cache_shift_decl_l
|
||||
= mf_mark (make_rename_temp (TREE_TYPE (mf_cache_shift_decl),
|
||||
= mf_mark (create_tmp_reg (TREE_TYPE (mf_cache_shift_decl),
|
||||
"__mf_lookup_shift_l"));
|
||||
|
||||
mf_cache_mask_decl_l
|
||||
= mf_mark (make_rename_temp (TREE_TYPE (mf_cache_mask_decl),
|
||||
= mf_mark (create_tmp_reg (TREE_TYPE (mf_cache_mask_decl),
|
||||
"__mf_lookup_mask_l"));
|
||||
|
||||
/* Build initialization nodes for the cache vars. We just load the
|
||||
|
|
@ -562,9 +562,9 @@ mf_build_check_statement_for (tree base, tree limit,
|
|||
add_bb_to_loop (then_bb, cond_bb->loop_father);
|
||||
|
||||
/* Build our local variables. */
|
||||
mf_elem = make_rename_temp (mf_cache_structptr_type, "__mf_elem");
|
||||
mf_base = make_rename_temp (mf_uintptr_type, "__mf_base");
|
||||
mf_limit = make_rename_temp (mf_uintptr_type, "__mf_limit");
|
||||
mf_elem = create_tmp_reg (mf_cache_structptr_type, "__mf_elem");
|
||||
mf_base = create_tmp_reg (mf_uintptr_type, "__mf_base");
|
||||
mf_limit = create_tmp_reg (mf_uintptr_type, "__mf_limit");
|
||||
|
||||
/* Build: __mf_base = (uintptr_t) <base address expression>. */
|
||||
seq = NULL;
|
||||
|
|
@ -645,7 +645,7 @@ mf_build_check_statement_for (tree base, tree limit,
|
|||
t = build2 (TRUTH_OR_EXPR, boolean_type_node, t, u);
|
||||
t = force_gimple_operand (t, &stmts, false, NULL_TREE);
|
||||
gimple_seq_add_seq (&seq, stmts);
|
||||
cond = make_rename_temp (boolean_type_node, "__mf_unlikely_cond");
|
||||
cond = create_tmp_reg (boolean_type_node, "__mf_unlikely_cond");
|
||||
g = gimple_build_assign (cond, t);
|
||||
gimple_set_location (g, location);
|
||||
gimple_seq_add_stmt (&seq, g);
|
||||
|
|
|
|||
|
|
@ -2120,7 +2120,7 @@ execute_sm_if_changed_flag_set (struct loop *loop, mem_ref_p ref)
|
|||
char *str = get_lsm_tmp_name (ref->mem, ~0);
|
||||
|
||||
lsm_tmp_name_add ("_flag");
|
||||
flag = make_rename_temp (boolean_type_node, str);
|
||||
flag = create_tmp_reg (boolean_type_node, str);
|
||||
get_all_locs_in_loop (loop, ref, &locs);
|
||||
FOR_EACH_VEC_ELT (mem_ref_loc_p, locs, i, loc)
|
||||
{
|
||||
|
|
@ -2158,7 +2158,7 @@ execute_sm (struct loop *loop, VEC (edge, heap) *exits, mem_ref_p ref)
|
|||
fprintf (dump_file, " from loop %d\n", loop->num);
|
||||
}
|
||||
|
||||
tmp_var = make_rename_temp (TREE_TYPE (ref->mem),
|
||||
tmp_var = create_tmp_reg (TREE_TYPE (ref->mem),
|
||||
get_lsm_tmp_name (ref->mem, ~0));
|
||||
|
||||
fmt_data.loop = loop;
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ insert_reciprocals (gimple_stmt_iterator *def_gsi, struct occurrence *occ,
|
|||
{
|
||||
/* Make a variable with the replacement and substitute it. */
|
||||
type = TREE_TYPE (def);
|
||||
recip_def = make_rename_temp (type, "reciptmp");
|
||||
recip_def = create_tmp_reg (type, "reciptmp");
|
||||
new_stmt = gimple_build_assign_with_ops (RDIV_EXPR, recip_def,
|
||||
build_one_cst (type), def);
|
||||
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ gimple_divmod_fixed_value (gimple stmt, tree value, int prob, gcov_type count,
|
|||
gsi_insert_before (&gsi, stmt3, GSI_SAME_STMT);
|
||||
bb1end = stmt3;
|
||||
|
||||
tmp2 = make_rename_temp (optype, "PROF");
|
||||
tmp2 = create_tmp_reg (optype, "PROF");
|
||||
stmt1 = gimple_build_assign_with_ops (gimple_assign_rhs_code (stmt), tmp2,
|
||||
op1, tmp0);
|
||||
gsi_insert_before (&gsi, stmt1, GSI_SAME_STMT);
|
||||
|
|
@ -767,7 +767,7 @@ gimple_mod_pow2 (gimple stmt, int prob, gcov_type count, gcov_type all)
|
|||
bb = gimple_bb (stmt);
|
||||
gsi = gsi_for_stmt (stmt);
|
||||
|
||||
result = make_rename_temp (optype, "PROF");
|
||||
result = create_tmp_reg (optype, "PROF");
|
||||
tmpv = create_tmp_var (optype, "PROF");
|
||||
tmp2 = make_ssa_name (tmpv, NULL);
|
||||
tmp3 = make_ssa_name (tmpv, NULL);
|
||||
|
|
@ -923,7 +923,7 @@ gimple_mod_subtract (gimple stmt, int prob1, int prob2, int ncounts,
|
|||
bb = gimple_bb (stmt);
|
||||
gsi = gsi_for_stmt (stmt);
|
||||
|
||||
result = make_rename_temp (optype, "PROF");
|
||||
result = create_tmp_reg (optype, "PROF");
|
||||
tmp1 = make_ssa_name (create_tmp_var (optype, "PROF"), NULL);
|
||||
stmt1 = gimple_build_assign (result, op1);
|
||||
stmt2 = gimple_build_assign (tmp1, op2);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue