alpha.c (alpha_emit_conditional_branch): Replace open-coded swap with std::swap to...

	* config/alpha/alpha.c (alpha_emit_conditional_branch): Replace
	open-coded swap with std::swap to swap values.
	(alpha_emit_setcc): Ditto.
	(alpha_emit_conditional_move): Ditto.
	(alpha_split_tmode_pair): Ditto.

From-SVN: r217360

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6baafa066ebca364c3b9c5fc669567dcf24cb741..3e2dec3223344dca129818f4061a244d939316b6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-11  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/alpha/alpha.c (alpha_emit_conditional_branch): Replace
+       open-coded swap with std::swap to swap values.
+       (alpha_emit_setcc): Ditto.
+       (alpha_emit_conditional_move): Ditto.
+       (alpha_split_tmode_pair): Ditto.
+
 2014-11-11  Evgeny Stupachenko  <evstupac@gmail.com>
 
         * tree-vect-data-refs.c (vect_shift_permute_load_chain): Extend shift

diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 3fe8131a9928d853df056666ebfbee798bf9feed..05db3dc99792c72b22222153925b3d0e317de106 100644 (file)
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -2545,7 +2545,7 @@ alpha_emit_conditional_branch (rtx operands[], machine_mode cmp_mode)
        {
          cmp_code = swap_condition (code);
          branch_code = NE;
-         tem = op0, op0 = op1, op1 = tem;
+         std::swap (op0, op1);
        }
       else
        {
@@ -2569,7 +2569,7 @@ alpha_emit_conditional_branch (rtx operands[], machine_mode cmp_mode)
          else if (op0 == CONST0_RTX (DFmode))
            {
              /* Undo the swap we probably did just above.  */
-             tem = op0, op0 = op1, op1 = tem;
+             std::swap (op0, op1);
              branch_code = swap_condition (cmp_code);
              cmp_code = UNKNOWN;
            }
@@ -2689,7 +2689,7 @@ alpha_emit_setcc (rtx operands[], machine_mode cmp_mode)
       code = swap_condition (code);
       if (cmp_mode == DFmode)
        cmp_code = code, code = NE;
-      tmp = op0, op0 = op1, op1 = tmp;
+      std::swap (op0, op1);
       break;
 
     default:
@@ -2786,7 +2786,7 @@ alpha_emit_conditional_move (rtx cmp, machine_mode mode)
            {
              cmp_code = swap_condition (code);
              code = NE;
-             tem = op0, op0 = op1, op1 = tem;
+             std::swap (op0, op1);
            }
          break;
 
@@ -2857,7 +2857,7 @@ alpha_emit_conditional_move (rtx cmp, machine_mode mode)
       if (cmp_mode == DImode && op1 == const0_rtx)
        break;
       code = swap_condition (code);
-      tem = op0, op0 = op1, op1 = tem;
+      std::swap (op0, op1);
       break;
 
     default:
@@ -3318,9 +3318,8 @@ alpha_split_tmode_pair (rtx operands[4], machine_mode mode,
 
   if (fixup_overlap && reg_overlap_mentioned_p (operands[0], operands[3]))
     {
-      rtx tmp;
-      tmp = operands[0], operands[0] = operands[1], operands[1] = tmp;
-      tmp = operands[2], operands[2] = operands[3], operands[3] = tmp;
+      std::swap (operands[0], operands[1]);
+      std::swap (operands[2], operands[3]);
     }
 }