summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ipa-cp.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ae4f39fb7d..d7820e41141 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-08 Martin Jambor <mjambor@suse.cz>
+
+ * ipa-cp.c (meet_with_1): Make the argument of abs signed. Remove
+ unnecessary MIN.
+
2015-10-08 Yuri Rumyantsev <ysrumyan@gmail.com>
* tree-vect-loop.c (vect_analyze_loop_operations): Skip virtual phi
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 0d9fdee79b6..d9d81f1e096 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -852,8 +852,8 @@ ipcp_alignment_lattice::meet_with_1 (unsigned new_align, unsigned new_misalign)
}
if (misalign != (new_misalign % align))
{
- int diff = abs (misalign - (new_misalign % align));
- align = MIN (align, (unsigned) diff & -diff);
+ int diff = abs ((int) misalign - (int) (new_misalign % align));
+ align = (unsigned) diff & -diff;
if (align)
misalign = misalign % align;
else