aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/dojump.c8
-rw-r--r--gcc/expr.c6
3 files changed, 9 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc06c7b..5c7558a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-29 Mikhail Maltsev <maltsevm@gmail.com>
+
+ * dojump.c (do_compare_rtx_and_jump): Use std::swap instead of
+ manual swaps.
+ * expr.c (expand_expr_real_2): Likewise.
+
2015-04-29 Jan Hubicka <hubicka@ucw.cz>
* tree.c (build_common_builtin_nodes): Do not build
diff --git a/gcc/dojump.c b/gcc/dojump.c
index ad356ba..0790c77 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -987,9 +987,7 @@ do_compare_rtx_and_jump (rtx op0, rtx op1, enum rtx_code code, int unsignedp,
if (can_compare_p (rcode, mode, ccp_jump)
|| (code == ORDERED && ! can_compare_p (ORDERED, mode, ccp_jump)))
{
- tem = if_true_label;
- if_true_label = if_false_label;
- if_false_label = tem;
+ std::swap (if_true_label, if_false_label);
code = rcode;
prob = inv (prob);
}
@@ -1000,9 +998,7 @@ do_compare_rtx_and_jump (rtx op0, rtx op1, enum rtx_code code, int unsignedp,
if (swap_commutative_operands_p (op0, op1))
{
- tem = op0;
- op0 = op1;
- op1 = tem;
+ std::swap (op0, op1);
code = swap_condition (code);
}
diff --git a/gcc/expr.c b/gcc/expr.c
index 530a944..25aa11f 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -8870,11 +8870,7 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode,
/* If op1 was placed in target, swap op0 and op1. */
if (target != op0 && target == op1)
- {
- temp = op0;
- op0 = op1;
- op1 = temp;
- }
+ std::swap (op0, op1);
/* We generate better code and avoid problems with op1 mentioning
target by forcing op1 into a pseudo if it isn't a constant. */