It's now a wrapper around create_tmp_reg. Bootstrap and regtest pending on x86_64-unknown-linux-gnu.
Richard. 2012-08-02 Richard Guenther <rguent...@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. Index: trunk/gcc/tree-dfa.c =================================================================== *** trunk.orig/gcc/tree-dfa.c 2012-08-02 10:32:07.000000000 +0200 --- trunk/gcc/tree-dfa.c 2012-08-02 10:40:21.102216493 +0200 *************** renumber_gimple_stmt_uids_in_blocks (bas *** 114,127 **** } } - /* 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); - } - /*--------------------------------------------------------------------------- --- 114,119 ---- Index: trunk/gcc/tree-flow.h =================================================================== *** trunk.orig/gcc/tree-flow.h 2012-08-02 10:16:24.000000000 +0200 --- trunk/gcc/tree-flow.h 2012-08-02 10:40:21.103216493 +0200 *************** extern void dump_dfa_stats (FILE *); *** 444,450 **** 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); --- 444,449 ---- Index: trunk/gcc/cgraphunit.c =================================================================== *** trunk.orig/gcc/cgraphunit.c 2012-08-02 10:13:51.000000000 +0200 --- trunk/gcc/cgraphunit.c 2012-08-02 10:42:22.119212303 +0200 *************** thunk_adjust (gimple_stmt_iterator * bsi *** 1280,1286 **** } vtabletmp = ! make_rename_temp (build_pointer_type (build_pointer_type (vtable_entry_type)), "vptr"); /* The vptr is always at offset zero in the object. */ --- 1280,1286 ---- } vtabletmp = ! create_tmp_reg (build_pointer_type (build_pointer_type (vtable_entry_type)), "vptr"); /* The vptr is always at offset zero in the object. */ *************** thunk_adjust (gimple_stmt_iterator * bsi *** 1290,1296 **** gsi_insert_after (bsi, stmt, GSI_NEW_STMT); /* Form the vtable address. */ ! vtabletmp2 = make_rename_temp (TREE_TYPE (TREE_TYPE (vtabletmp)), "vtableaddr"); stmt = gimple_build_assign (vtabletmp2, build_simple_mem_ref (vtabletmp)); --- 1290,1296 ---- gsi_insert_after (bsi, stmt, GSI_NEW_STMT); /* Form the vtable address. */ ! vtabletmp2 = create_tmp_reg (TREE_TYPE (TREE_TYPE (vtabletmp)), "vtableaddr"); stmt = gimple_build_assign (vtabletmp2, build_simple_mem_ref (vtabletmp)); *************** thunk_adjust (gimple_stmt_iterator * bsi *** 1304,1310 **** gsi_insert_after (bsi, stmt, GSI_NEW_STMT); /* Get the offset itself. */ ! vtabletmp3 = make_rename_temp (TREE_TYPE (TREE_TYPE (vtabletmp2)), "vcalloffset"); stmt = gimple_build_assign (vtabletmp3, build_simple_mem_ref (vtabletmp2)); --- 1304,1310 ---- gsi_insert_after (bsi, stmt, GSI_NEW_STMT); /* Get the offset itself. */ ! vtabletmp3 = create_tmp_reg (TREE_TYPE (TREE_TYPE (vtabletmp2)), "vcalloffset"); stmt = gimple_build_assign (vtabletmp3, build_simple_mem_ref (vtabletmp2)); *************** thunk_adjust (gimple_stmt_iterator * bsi *** 1326,1332 **** ptrtmp = ptr; else { ! ptrtmp = make_rename_temp (TREE_TYPE (ptr), "ptr"); stmt = gimple_build_assign (ptrtmp, ptr); gsi_insert_after (bsi, stmt, GSI_NEW_STMT); } --- 1326,1332 ---- ptrtmp = ptr; else { ! ptrtmp = create_tmp_reg (TREE_TYPE (ptr), "ptr"); stmt = gimple_build_assign (ptrtmp, ptr); gsi_insert_after (bsi, stmt, GSI_NEW_STMT); } *************** thunk_adjust (gimple_stmt_iterator * bsi *** 1335,1341 **** } /* Emit the statement and gimplify the adjustment expression. */ ! ret = make_rename_temp (TREE_TYPE (ptr), "adjusted_this"); stmt = gimple_build_assign (ret, ptr); gsi_insert_after (bsi, stmt, GSI_NEW_STMT); --- 1335,1341 ---- } /* Emit the statement and gimplify the adjustment expression. */ ! ret = create_tmp_reg (TREE_TYPE (ptr), "adjusted_this"); stmt = gimple_build_assign (ret, ptr); gsi_insert_after (bsi, stmt, GSI_NEW_STMT); *************** assemble_thunk (struct cgraph_node *node *** 1440,1446 **** BLOCK_VARS (DECL_INITIAL (current_function_decl)) = restmp; } else ! restmp = make_rename_temp (restype, "retval"); } for (arg = a; arg; arg = DECL_CHAIN (arg)) --- 1440,1446 ---- BLOCK_VARS (DECL_INITIAL (current_function_decl)) = restmp; } else ! restmp = create_tmp_reg (restype, "retval"); } for (arg = a; arg; arg = DECL_CHAIN (arg)) Index: trunk/gcc/omp-low.c =================================================================== *** trunk.orig/gcc/omp-low.c 2012-08-02 10:16:24.000000000 +0200 --- trunk/gcc/omp-low.c 2012-08-02 10:43:10.761210619 +0200 *************** expand_omp_for_generic (struct omp_regio *** 3811,3817 **** counts[i] = t; else { ! counts[i] = make_rename_temp (type, ".count"); t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE, true, GSI_SAME_STMT); stmt = gimple_build_assign (counts[i], t); --- 3811,3817 ---- counts[i] = t; else { ! 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); *************** expand_omp_for_generic (struct omp_regio *** 3936,3942 **** false, GSI_CONTINUE_LINKING); if (fd->collapse > 1) { ! tree tem = make_rename_temp (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--) --- 3936,3942 ---- false, GSI_CONTINUE_LINKING); if (fd->collapse > 1) { ! 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--) *************** expand_omp_for_static_nochunk (struct om *** 4224,4235 **** 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"); 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"); 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); --- 4224,4235 ---- t = fold_convert (itype, t); n = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true, GSI_SAME_STMT); ! 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 = 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); *************** expand_omp_atomic_pipeline (basic_block *** 5289,5296 **** { tree iaddr_val; ! iaddr = make_rename_temp (build_pointer_type_for_mode (itype, ptr_mode, ! true), NULL); iaddr_val = force_gimple_operand_gsi (&si, fold_convert (TREE_TYPE (iaddr), addr), --- 5289,5296 ---- { tree iaddr_val; ! 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), Index: trunk/gcc/trans-mem.c =================================================================== *** trunk.orig/gcc/trans-mem.c 2012-08-02 10:13:52.000000000 +0200 --- trunk/gcc/trans-mem.c 2012-08-02 10:41:08.570214850 +0200 *************** tm_log_emit_save_or_restores (basic_bloc *** 1285,1291 **** gsi = gsi_last_bb (cond_bb); /* t1 = status & A_{property}. */ ! t1 = make_rename_temp (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); --- 1285,1291 ---- gsi = gsi_last_bb (cond_bb); /* t1 = status & A_{property}. */ ! 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); *************** build_tm_load (location_t loc, tree lhs, *** 2057,2063 **** gimple g; tree temp; ! temp = make_rename_temp (t, NULL); gimple_call_set_lhs (gcall, temp); gsi_insert_before (gsi, gcall, GSI_SAME_STMT); --- 2057,2063 ---- gimple g; tree temp; ! temp = create_tmp_reg (t, NULL); gimple_call_set_lhs (gcall, temp); gsi_insert_before (gsi, gcall, GSI_SAME_STMT); *************** build_tm_store (location_t loc, tree lhs *** 2135,2141 **** gimple g; tree temp; ! temp = make_rename_temp (simple_type, NULL); t = fold_build1 (VIEW_CONVERT_EXPR, simple_type, rhs); g = gimple_build_assign (temp, t); gimple_set_location (g, loc); --- 2135,2141 ---- gimple g; tree temp; ! 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); *************** expand_call_tm (struct tm_region *region *** 2302,2308 **** 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); location_t loc = gimple_location (stmt); edge fallthru_edge = NULL; --- 2302,2308 ---- if (lhs && requires_barrier (region->entry_block, lhs, stmt) && !gimple_call_return_slot_opt_p (stmt)) { ! tree tmp = create_tmp_reg (TREE_TYPE (lhs), NULL); location_t loc = gimple_location (stmt); edge fallthru_edge = NULL; *************** expand_transaction (struct tm_region *re *** 2638,2644 **** int flags, subcode; tm_start = builtin_decl_explicit (BUILT_IN_TM_START); ! status = make_rename_temp (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); --- 2638,2644 ---- int flags, subcode; tm_start = builtin_decl_explicit (BUILT_IN_TM_START); ! 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); *************** expand_transaction (struct tm_region *re *** 2695,2701 **** region->entry_block = test_bb; gsi = gsi_last_bb (test_bb); ! t1 = make_rename_temp (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); --- 2695,2701 ---- region->entry_block = test_bb; gsi = gsi_last_bb (test_bb); ! 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); *************** ipa_tm_insert_gettmclone_call (struct cg *** 4499,4505 **** { tree temp; ! temp = make_rename_temp (rettype, 0); gimple_call_set_lhs (stmt, temp); g2 = gimple_build_assign (lhs, --- 4499,4505 ---- { tree temp; ! temp = create_tmp_reg (rettype, 0); gimple_call_set_lhs (stmt, temp); g2 = gimple_build_assign (lhs, Index: trunk/gcc/tree-complex.c =================================================================== *** trunk.orig/gcc/tree-complex.c 2012-08-02 10:16:24.000000000 +0200 --- trunk/gcc/tree-complex.c 2012-08-02 10:41:12.143214726 +0200 *************** expand_complex_div_wide (gimple_stmt_ite *** 1155,1162 **** set_immediate_dominator (CDI_DOMINATORS, bb_false, bb_cond); } ! rr = make_rename_temp (inner_type, NULL); ! ri = make_rename_temp (inner_type, NULL); } /* In the TRUE branch, we compute --- 1155,1162 ---- set_immediate_dominator (CDI_DOMINATORS, bb_false, bb_cond); } ! rr = create_tmp_reg (inner_type, NULL); ! ri = create_tmp_reg (inner_type, NULL); } /* In the TRUE branch, we compute Index: trunk/gcc/tree-mudflap.c =================================================================== *** trunk.orig/gcc/tree-mudflap.c 2012-08-02 10:11:02.000000000 +0200 --- trunk/gcc/tree-mudflap.c 2012-08-02 10:41:17.948214525 +0200 *************** mf_decl_cache_locals (void) *** 471,481 **** /* Build the cache vars. */ mf_cache_shift_decl_l ! = mf_mark (make_rename_temp (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_lookup_mask_l")); /* Build initialization nodes for the cache vars. We just load the --- 471,481 ---- /* Build the cache vars. */ mf_cache_shift_decl_l ! = mf_mark (create_tmp_reg (TREE_TYPE (mf_cache_shift_decl), "__mf_lookup_shift_l")); mf_cache_mask_decl_l ! = 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 *************** mf_build_check_statement_for (tree base, *** 562,570 **** 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"); /* Build: __mf_base = (uintptr_t) <base address expression>. */ seq = NULL; --- 562,570 ---- add_bb_to_loop (then_bb, cond_bb->loop_father); /* Build our local variables. */ ! 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; *************** mf_build_check_statement_for (tree base, *** 645,651 **** 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"); g = gimple_build_assign (cond, t); gimple_set_location (g, location); gimple_seq_add_stmt (&seq, g); --- 645,651 ---- 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 = 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); Index: trunk/gcc/tree-ssa-loop-im.c =================================================================== *** trunk.orig/gcc/tree-ssa-loop-im.c 2012-08-02 10:13:51.000000000 +0200 --- trunk/gcc/tree-ssa-loop-im.c 2012-08-02 10:41:20.597214431 +0200 *************** execute_sm_if_changed_flag_set (struct l *** 2120,2126 **** char *str = get_lsm_tmp_name (ref->mem, ~0); lsm_tmp_name_add ("_flag"); ! flag = make_rename_temp (boolean_type_node, str); get_all_locs_in_loop (loop, ref, &locs); FOR_EACH_VEC_ELT (mem_ref_loc_p, locs, i, loc) { --- 2120,2126 ---- char *str = get_lsm_tmp_name (ref->mem, ~0); lsm_tmp_name_add ("_flag"); ! 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) { *************** execute_sm (struct loop *loop, VEC (edge *** 2158,2164 **** fprintf (dump_file, " from loop %d\n", loop->num); } ! tmp_var = make_rename_temp (TREE_TYPE (ref->mem), get_lsm_tmp_name (ref->mem, ~0)); fmt_data.loop = loop; --- 2158,2164 ---- fprintf (dump_file, " from loop %d\n", loop->num); } ! tmp_var = create_tmp_reg (TREE_TYPE (ref->mem), get_lsm_tmp_name (ref->mem, ~0)); fmt_data.loop = loop; Index: trunk/gcc/tree-ssa-math-opts.c =================================================================== *** trunk.orig/gcc/tree-ssa-math-opts.c 2012-08-02 10:16:24.000000000 +0200 --- trunk/gcc/tree-ssa-math-opts.c 2012-08-02 10:41:28.541214158 +0200 *************** insert_reciprocals (gimple_stmt_iterator *** 345,351 **** { /* Make a variable with the replacement and substitute it. */ type = TREE_TYPE (def); ! recip_def = make_rename_temp (type, "reciptmp"); new_stmt = gimple_build_assign_with_ops (RDIV_EXPR, recip_def, build_one_cst (type), def); --- 345,351 ---- { /* Make a variable with the replacement and substitute it. */ type = TREE_TYPE (def); ! recip_def = create_tmp_reg (type, "reciptmp"); new_stmt = gimple_build_assign_with_ops (RDIV_EXPR, recip_def, build_one_cst (type), def); Index: trunk/gcc/value-prof.c =================================================================== *** trunk.orig/gcc/value-prof.c 2012-08-02 10:11:02.000000000 +0200 --- trunk/gcc/value-prof.c 2012-08-02 10:41:34.038213968 +0200 *************** gimple_divmod_fixed_value (gimple stmt, *** 623,629 **** gsi_insert_before (&gsi, stmt3, GSI_SAME_STMT); bb1end = stmt3; ! tmp2 = make_rename_temp (optype, "PROF"); stmt1 = gimple_build_assign_with_ops (gimple_assign_rhs_code (stmt), tmp2, op1, tmp0); gsi_insert_before (&gsi, stmt1, GSI_SAME_STMT); --- 623,629 ---- gsi_insert_before (&gsi, stmt3, GSI_SAME_STMT); bb1end = stmt3; ! 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); *************** gimple_mod_pow2 (gimple stmt, int prob, *** 767,773 **** bb = gimple_bb (stmt); gsi = gsi_for_stmt (stmt); ! result = make_rename_temp (optype, "PROF"); tmpv = create_tmp_var (optype, "PROF"); tmp2 = make_ssa_name (tmpv, NULL); tmp3 = make_ssa_name (tmpv, NULL); --- 767,773 ---- bb = gimple_bb (stmt); gsi = gsi_for_stmt (stmt); ! result = create_tmp_reg (optype, "PROF"); tmpv = create_tmp_var (optype, "PROF"); tmp2 = make_ssa_name (tmpv, NULL); tmp3 = make_ssa_name (tmpv, NULL); *************** gimple_mod_subtract (gimple stmt, int pr *** 923,929 **** bb = gimple_bb (stmt); gsi = gsi_for_stmt (stmt); ! result = make_rename_temp (optype, "PROF"); tmp1 = make_ssa_name (create_tmp_var (optype, "PROF"), NULL); stmt1 = gimple_build_assign (result, op1); stmt2 = gimple_build_assign (tmp1, op2); --- 923,929 ---- bb = gimple_bb (stmt); gsi = gsi_for_stmt (stmt); ! 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);