From d8204b12f67e69835e793d6700b09bf7e1a474a8 Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Fri, 12 Jun 2015 13:18:17 +0000 Subject: [PATCH] [ifcvt][obvious] Use std::swap instead of manually swapping * ifcvt.c (noce_try_store_flag_constants): Use std::swap instead of manually swapping. (noce_try_cmove_arith): Likewise. (noce_get_alt_condition): Likewise. From-SVN: r224429 --- gcc/ChangeLog | 7 +++++++ gcc/ifcvt.c | 12 ++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74df9aa295b..efa166a112e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-06-12 Kyrylo Tkachov + + * ifcvt.c (noce_try_store_flag_constants): Use std::swap instead of + manually swapping. + (noce_try_cmove_arith): Likewise. + (noce_get_alt_condition): Likewise. + 2015-06-12 Venkataramanan Kumar * common/config/i386/i386-common.c diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index fd3d258ab49..50ccaa11f0b 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -1217,7 +1217,7 @@ noce_try_store_flag_constants (struct noce_if_info *if_info) if (reversep) { - tmp = itrue; itrue = ifalse; ifalse = tmp; + std::swap (itrue, ifalse); diff = trunc_int_for_mode (-(unsigned HOST_WIDE_INT) diff, mode); } @@ -1679,11 +1679,9 @@ noce_try_cmove_arith (struct noce_if_info *if_info) if (reversep) { - rtx tmp; - rtx_insn *tmp_insn; code = reversed_comparison_code (if_info->cond, if_info->jump); - tmp = a, a = b, b = tmp; - tmp_insn = insn_a, insn_a = insn_b, insn_b = tmp_insn; + std::swap (a, b); + std::swap (insn_a, insn_b); } } @@ -1865,9 +1863,7 @@ noce_get_alt_condition (struct noce_if_info *if_info, rtx target, if (CONST_INT_P (op_a)) { - rtx tmp = op_a; - op_a = op_b; - op_b = tmp; + std::swap (op_a, op_b); code = swap_condition (code); } } -- 2.30.2