On Tue, Dec 02, 2014 at 08:37:19AM +0100, Jakub Jelinek wrote:
> Anyway, sorry for missing this, supposedly I've grepped for it in
> subdirectories of gcc/ but not in the second level subdirectories.
> And, apparently I've missed it also some time ago when removing unnecessary
> last NULL arguments too (both for gimple_build_assign_with_ops and
> create_tmp_*/*_ssa_name).
And here is the patch to adjust create_tmp_var uses in config/*/*,
committed as obvious:
2014-12-02 Jakub Jelinek <ja...@redhat.com>
* config/sparc/sparc.c (sparc_atomic_assign_expand_fenv):
Remove NULL last argument from create_tmp_var calls.
* config/mips/mips.c (mips_atomic_assign_expand_fenv): Likewise.
* config/arm/arm-builtins.c (arm_atomic_assign_expand_fenv): Likewise.
* config/i386/i386.c (add_condition_to_bb,
ix86_atomic_assign_expand_fenv): Likewise.
* config/mep/mep.c (mep_gimplify_va_arg_expr): Likewise.
* config/xtensa/xtensa.c (xtensa_gimplify_va_arg_expr): Likewise.
* config/aarch64/aarch64-builtins.c
(aarch64_atomic_assign_expand_fenv): Likewise.
* config/stormy16/stormy16.c (xstormy16_gimplify_va_arg_expr):
Likewise.
* config/rs6000/rs6000.c (rs6000_atomic_assign_expand_fenv): Likewise.
* config/alpha/alpha.c (alpha_atomic_assign_expand_fenv): Likewise.
* config/sh/sh.c (sh_gimplify_va_arg_expr): Likewise.
--- gcc/config/sparc/sparc.c.jj 2014-11-12 09:31:58.651636265 +0100
+++ gcc/config/sparc/sparc.c 2014-12-02 08:41:48.061749330 +0100
@@ -12608,13 +12608,13 @@ sparc_atomic_assign_expand_fenv (tree *h
__builtin_load_fsr (&tmp1_var); */
- tree fenv_var = create_tmp_var (unsigned_type_node, NULL);
+ tree fenv_var = create_tmp_var (unsigned_type_node);
mark_addressable (fenv_var);
tree fenv_addr = build_fold_addr_expr (fenv_var);
tree stfsr = sparc_builtins[SPARC_BUILTIN_STFSR];
tree hold_stfsr = build_call_expr (stfsr, 1, fenv_addr);
- tree tmp1_var = create_tmp_var (unsigned_type_node, NULL);
+ tree tmp1_var = create_tmp_var (unsigned_type_node);
mark_addressable (tmp1_var);
tree masked_fenv_var
= build2 (BIT_AND_EXPR, unsigned_type_node, fenv_var,
@@ -12646,7 +12646,7 @@ sparc_atomic_assign_expand_fenv (tree *h
tmp2_var >>= 5;
__atomic_feraiseexcept ((int) tmp2_var); */
- tree tmp2_var = create_tmp_var (unsigned_type_node, NULL);
+ tree tmp2_var = create_tmp_var (unsigned_type_node);
mark_addressable (tmp2_var);
tree tmp3_addr = build_fold_addr_expr (tmp2_var);
tree update_stfsr = build_call_expr (stfsr, 1, tmp3_addr);
--- gcc/config/mips/mips.c.jj 2014-12-01 22:37:58.204052801 +0100
+++ gcc/config/mips/mips.c 2014-12-02 08:41:16.482309608 +0100
@@ -19051,9 +19051,9 @@ mips_atomic_assign_expand_fenv (tree *ho
{
if (!TARGET_HARD_FLOAT_ABI)
return;
- tree exceptions_var = create_tmp_var (MIPS_ATYPE_USI, NULL);
- tree fcsr_orig_var = create_tmp_var (MIPS_ATYPE_USI, NULL);
- tree fcsr_mod_var = create_tmp_var (MIPS_ATYPE_USI, NULL);
+ tree exceptions_var = create_tmp_var (MIPS_ATYPE_USI);
+ tree fcsr_orig_var = create_tmp_var (MIPS_ATYPE_USI);
+ tree fcsr_mod_var = create_tmp_var (MIPS_ATYPE_USI);
tree get_fcsr = mips_builtin_decls[MIPS_GET_FCSR];
tree set_fcsr = mips_builtin_decls[MIPS_SET_FCSR];
tree get_fcsr_hold_call = build_call_expr (get_fcsr, 0);
--- gcc/config/arm/arm-builtins.c.jj 2014-12-02 08:40:01.744635945 +0100
+++ gcc/config/arm/arm-builtins.c 2014-12-02 08:40:40.460948864 +0100
@@ -2883,7 +2883,7 @@ arm_atomic_assign_expand_fenv (tree *hol
__builtin_arm_set_fpscr (masked_fenv); */
- fenv_var = create_tmp_var (unsigned_type_node, NULL);
+ fenv_var = create_tmp_var (unsigned_type_node);
get_fpscr = arm_builtin_decls[ARM_BUILTIN_GET_FPSCR];
set_fpscr = arm_builtin_decls[ARM_BUILTIN_SET_FPSCR];
mask = build_int_cst (unsigned_type_node,
@@ -2910,7 +2910,7 @@ arm_atomic_assign_expand_fenv (tree *hol
__atomic_feraiseexcept (new_fenv_var); */
- new_fenv_var = create_tmp_var (unsigned_type_node, NULL);
+ new_fenv_var = create_tmp_var (unsigned_type_node);
reload_fenv = build2 (MODIFY_EXPR, unsigned_type_node, new_fenv_var,
build_call_expr (get_fpscr, 0));
restore_fnenv = build_call_expr (set_fpscr, 1, fenv_var);
--- gcc/config/i386/i386.c.jj 2014-12-02 08:40:01.812634739 +0100
+++ gcc/config/i386/i386.c 2014-12-02 08:41:04.121528970 +0100
@@ -34111,7 +34111,7 @@ add_condition_to_bb (tree function_decl,
convert_expr = build1 (CONVERT_EXPR, ptr_type_node,
build_fold_addr_expr (version_decl));
- result_var = create_tmp_var (ptr_type_node, NULL);
+ result_var = create_tmp_var (ptr_type_node);
convert_stmt = gimple_build_assign (result_var, convert_expr);
return_stmt = gimple_build_return (result_var);
@@ -34128,7 +34128,7 @@ add_condition_to_bb (tree function_decl,
while (predicate_chain != NULL)
{
- cond_var = create_tmp_var (integer_type_node, NULL);
+ cond_var = create_tmp_var (integer_type_node);
predicate_decl = TREE_PURPOSE (predicate_chain);
predicate_arg = TREE_VALUE (predicate_chain);
call_cond_stmt = gimple_build_call (predicate_decl, 1, predicate_arg);
@@ -51337,12 +51337,12 @@ ix86_atomic_assign_expand_fenv (tree *ho
{
if (!TARGET_80387 && !TARGET_SSE_MATH)
return;
- tree exceptions_var = create_tmp_var (integer_type_node, NULL);
+ tree exceptions_var = create_tmp_var (integer_type_node);
if (TARGET_80387)
{
tree fenv_index_type = build_index_type (size_int (6));
tree fenv_type = build_array_type (unsigned_type_node, fenv_index_type);
- tree fenv_var = create_tmp_var (fenv_type, NULL);
+ tree fenv_var = create_tmp_var (fenv_type);
mark_addressable (fenv_var);
tree fenv_ptr = build_pointer_type (fenv_type);
tree fenv_addr = build1 (ADDR_EXPR, fenv_ptr, fenv_var);
@@ -51356,7 +51356,7 @@ ix86_atomic_assign_expand_fenv (tree *ho
*hold = build2 (COMPOUND_EXPR, void_type_node, hold_fnstenv,
hold_fnclex);
*clear = build_call_expr (fnclex, 0);
- tree sw_var = create_tmp_var (short_unsigned_type_node, NULL);
+ tree sw_var = create_tmp_var (short_unsigned_type_node);
tree fnstsw_call = build_call_expr (fnstsw, 0);
tree sw_mod = build2 (MODIFY_EXPR, short_unsigned_type_node,
sw_var, fnstsw_call);
@@ -51370,8 +51370,8 @@ ix86_atomic_assign_expand_fenv (tree *ho
}
if (TARGET_SSE_MATH)
{
- tree mxcsr_orig_var = create_tmp_var (unsigned_type_node, NULL);
- tree mxcsr_mod_var = create_tmp_var (unsigned_type_node, NULL);
+ tree mxcsr_orig_var = create_tmp_var (unsigned_type_node);
+ tree mxcsr_mod_var = create_tmp_var (unsigned_type_node);
tree stmxcsr = ix86_builtins[IX86_BUILTIN_STMXCSR];
tree ldmxcsr = ix86_builtins[IX86_BUILTIN_LDMXCSR];
tree stmxcsr_hold_call = build_call_expr (stmxcsr, 0);
--- gcc/config/mep/mep.c.jj 2014-11-10 19:16:11.358603568 +0100
+++ gcc/config/mep/mep.c 2014-12-02 08:41:08.269455358 +0100
@@ -3597,7 +3597,7 @@ mep_gimplify_va_arg_expr (tree valist, t
label_sover = create_artificial_label (UNKNOWN_LOCATION);
label_selse = create_artificial_label (UNKNOWN_LOCATION);
- res_addr = create_tmp_var (ptr_type_node, NULL);
+ res_addr = create_tmp_var (ptr_type_node);
tmp = build2 (GE_EXPR, boolean_type_node, next_gp,
unshare_expr (next_gp_limit));
--- gcc/config/xtensa/xtensa.c.jj 2014-11-19 17:18:37.320047284 +0100
+++ gcc/config/xtensa/xtensa.c 2014-12-02 08:41:54.500635104 +0100
@@ -3014,7 +3014,7 @@ xtensa_gimplify_va_arg_expr (tree valist
&& !must_pass_in_stack (type))
__array = (AP).__va_reg; */
- array = create_tmp_var (ptr_type_node, NULL);
+ array = create_tmp_var (ptr_type_node);
lab_over = NULL;
if (!targetm.calls.must_pass_in_stack (TYPE_MODE (type), type))
--- gcc/config/aarch64/aarch64-builtins.c.jj 2014-12-02 08:40:01.564639140
+0100
+++ gcc/config/aarch64/aarch64-builtins.c 2014-12-02 08:40:28.610159174
+0100
@@ -1391,8 +1391,8 @@ aarch64_atomic_assign_expand_fenv (tree
__builtin_aarch64_set_cr (masked_cr);
__builtin_aarch64_set_sr (masked_sr); */
- fenv_cr = create_tmp_var (unsigned_type_node, NULL);
- fenv_sr = create_tmp_var (unsigned_type_node, NULL);
+ fenv_cr = create_tmp_var (unsigned_type_node);
+ fenv_sr = create_tmp_var (unsigned_type_node);
get_fpcr = aarch64_builtin_decls[AARCH64_BUILTIN_GET_FPCR];
set_fpcr = aarch64_builtin_decls[AARCH64_BUILTIN_SET_FPCR];
@@ -1438,7 +1438,7 @@ aarch64_atomic_assign_expand_fenv (tree
__atomic_feraiseexcept (new_fenv_var); */
- new_fenv_var = create_tmp_var (unsigned_type_node, NULL);
+ new_fenv_var = create_tmp_var (unsigned_type_node);
reload_fenv = build2 (MODIFY_EXPR, unsigned_type_node,
new_fenv_var, build_call_expr (get_fpsr, 0));
restore_fnenv = build_call_expr (set_fpsr, 1, fenv_sr);
--- gcc/config/stormy16/stormy16.c.jj 2014-11-10 19:16:11.710597055 +0100
+++ gcc/config/stormy16/stormy16.c 2014-12-02 08:41:51.395690186 +0100
@@ -1373,7 +1373,7 @@ xstormy16_gimplify_va_arg_expr (tree val
count_tmp = get_initialized_tmp_var (count, pre_p, NULL);
lab_gotaddr = create_artificial_label (UNKNOWN_LOCATION);
lab_fromstack = create_artificial_label (UNKNOWN_LOCATION);
- addr = create_tmp_var (ptr_type_node, NULL);
+ addr = create_tmp_var (ptr_type_node);
if (!must_stack)
{
--- gcc/config/rs6000/rs6000.c.jj 2014-11-28 14:41:00.595860188 +0100
+++ gcc/config/rs6000/rs6000.c 2014-12-02 08:41:30.167066785 +0100
@@ -34914,7 +34914,7 @@ rs6000_atomic_assign_expand_fenv (tree *
DECL_EXTERNAL (atomic_update_decl) = 1;
}
- tree fenv_var = create_tmp_var (double_type_node, NULL);
+ tree fenv_var = create_tmp_var (double_type_node);
mark_addressable (fenv_var);
tree fenv_addr = build1 (ADDR_EXPR, double_ptr_type_node, fenv_var);
@@ -34942,7 +34942,7 @@ rs6000_atomic_assign_expand_fenv (tree *
const unsigned HOST_WIDE_INT hold_exception_mask =
HOST_WIDE_INT_C (0xffffffff00000007);
- tree fenv_var = create_tmp_var (double_type_node, NULL);
+ tree fenv_var = create_tmp_var (double_type_node);
tree hold_mffs = build2 (MODIFY_EXPR, void_type_node, fenv_var, call_mffs);
@@ -34971,7 +34971,7 @@ rs6000_atomic_assign_expand_fenv (tree *
const unsigned HOST_WIDE_INT clear_exception_mask =
HOST_WIDE_INT_C (0xffffffff00000000);
- tree fenv_clear = create_tmp_var (double_type_node, NULL);
+ tree fenv_clear = create_tmp_var (double_type_node);
tree clear_mffs = build2 (MODIFY_EXPR, void_type_node, fenv_clear,
call_mffs);
@@ -35003,7 +35003,7 @@ rs6000_atomic_assign_expand_fenv (tree *
const unsigned HOST_WIDE_INT new_exception_mask =
HOST_WIDE_INT_C (0x1ff80fff);
- tree old_fenv = create_tmp_var (double_type_node, NULL);
+ tree old_fenv = create_tmp_var (double_type_node);
tree update_mffs = build2 (MODIFY_EXPR, void_type_node, old_fenv, call_mffs);
tree old_llu = build1 (VIEW_CONVERT_EXPR, uint64_type_node, old_fenv);
--- gcc/config/alpha/alpha.c.jj 2014-12-02 08:40:01.484640559 +0100
+++ gcc/config/alpha/alpha.c 2014-12-02 08:40:35.031045226 +0100
@@ -9885,7 +9885,7 @@ alpha_atomic_assign_expand_fenv (tree *h
__ieee_set_fp_control (masked_fenv); */
- fenv_var = create_tmp_var (long_unsigned_type_node, NULL);
+ fenv_var = create_tmp_var (long_unsigned_type_node);
get_fpscr
= build_fn_decl ("__ieee_get_fp_control",
build_function_type_list (long_unsigned_type_node, NULL));
@@ -9914,7 +9914,7 @@ alpha_atomic_assign_expand_fenv (tree *h
__atomic_feraiseexcept (new_fenv_var); */
- new_fenv_var = create_tmp_var (long_unsigned_type_node, NULL);
+ new_fenv_var = create_tmp_var (long_unsigned_type_node);
reload_fenv = build2 (MODIFY_EXPR, long_unsigned_type_node, new_fenv_var,
build_call_expr (get_fpscr, 0));
restore_fnenv = build_call_expr (set_fpscr, 1, fenv_var);
--- gcc/config/sh/sh.c.jj 2014-12-01 10:44:28.055585868 +0100
+++ gcc/config/sh/sh.c 2014-12-02 08:41:36.863947981 +0100
@@ -8629,7 +8629,7 @@ sh_gimplify_va_arg_expr (tree valist, tr
pass_as_float = (TREE_CODE (eff_type) == REAL_TYPE && size == 4);
}
- addr = create_tmp_var (pptr_type_node, NULL);
+ addr = create_tmp_var (pptr_type_node);
lab_false = create_artificial_label (UNKNOWN_LOCATION);
lab_over = create_artificial_label (UNKNOWN_LOCATION);
@@ -8637,7 +8637,7 @@ sh_gimplify_va_arg_expr (tree valist, tr
if (pass_as_float)
{
- tree next_fp_tmp = create_tmp_var (TREE_TYPE (f_next_fp), NULL);
+ tree next_fp_tmp = create_tmp_var (TREE_TYPE (f_next_fp));
tree cmp;
bool is_double = size == 8 && TREE_CODE (eff_type) == REAL_TYPE;
Jakub
