aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/fold-const.c2
-rw-r--r--gcc/match.pd2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr81227.c22
-rw-r--r--gcc/tree-ssa-reassoc.c2
6 files changed, 39 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 293671b..34de7cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-06-28 Richard Biener <rguenther@suse.de>
+
+ PR middle-end/81227
+ * fold-const.c (negate_expr_p): Use TYPE_UNSIGNED, not
+ TYPE_OVERFLOW_WRAPS.
+ * match.pd (negate_expr_p): Likewise.
+ * tree-ssa-reassoc.c (optimize_range_tests_diff): Use
+ fold_build2, not fold_binary.
+
2017-06-28 Wilco Dijkstra <wdijkstr@arm.com>
* config/aarch64/aarch64 (aarch64_expand_mov_immediate):
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 379a30e..1bcbbb5 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -383,7 +383,7 @@ negate_expr_p (tree t)
switch (TREE_CODE (t))
{
case INTEGER_CST:
- if (INTEGRAL_TYPE_P (type) && TYPE_OVERFLOW_WRAPS (type))
+ if (INTEGRAL_TYPE_P (type) && TYPE_UNSIGNED (type))
return true;
/* Check that -CST will not overflow type. */
diff --git a/gcc/match.pd b/gcc/match.pd
index ede5504..4c64b21 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -914,7 +914,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
(match negate_expr_p
INTEGER_CST
(if ((INTEGRAL_TYPE_P (type)
- && TYPE_OVERFLOW_WRAPS (type))
+ && TYPE_UNSIGNED (type))
|| (!TYPE_OVERFLOW_SANITIZED (type)
&& may_negate_without_overflow_p (t)))))
(match negate_expr_p
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d50a9d8..a96d5ab 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-28 Richard Biener <rguenther@suse.de>
+
+ PR middle-end/81227
+ * gcc.dg/pr81227.c: New testcase.
+
2017-06-28 Michael Meissner <meissner@linux.vnet.ibm.com>
PR target/81193
diff --git a/gcc/testsuite/gcc.dg/pr81227.c b/gcc/testsuite/gcc.dg/pr81227.c
new file mode 100644
index 0000000..bdaa8cb
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr81227.c
@@ -0,0 +1,22 @@
+/* Copy of gcc.c-torture/compile/pr80443.c */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fwrapv" } */
+
+struct S { int a : 1; } b, c;
+signed char d, e, f;
+
+void
+foo ()
+{
+ while (f)
+ {
+ signed char g = b.a;
+ if (g)
+ b.a = ~(1 + (d || c.a));
+ if (b.a < g && b.a)
+ g = 0;
+ if (b.a > c.a)
+ b.a = g;
+ c.a = e;
+ }
+}
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 35eb72c..982ab79 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -2561,7 +2561,7 @@ optimize_range_tests_diff (enum tree_code opcode, tree type,
tem2 = fold_convert (type, tem2);
lowi = fold_convert (type, lowi);
mask = fold_build1 (BIT_NOT_EXPR, type, tem1);
- tem1 = fold_binary (MINUS_EXPR, type,
+ tem1 = fold_build2 (MINUS_EXPR, type,
fold_convert (type, rangei->exp), lowi);
tem1 = fold_build2 (BIT_AND_EXPR, type, tem1, mask);
lowj = build_int_cst (type, 0);