From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 6 Feb 2015 11:36:34 +0000 (+0100)
Subject: re PR rtl-optimization/64957 (wrong code at -O1, -O2 and -O3 on x86_64-linux-gnu)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d26ac279bca9a071d5f4de994b1dc8cd214335c2;p=gcc.git

re PR rtl-optimization/64957 (wrong code at -O1, -O2 and -O3 on x86_64-linux-gnu)

	PR rtl-optimization/64957
	PR debug/64817
	* simplify-rtx.c (simplify_binary_operation_1): Use ~cval for
	IOR rather than for AND.

	* gcc.c-torture/execute/pr64957.c: New test.

From-SVN: r220475
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cf5049d0db..3a5d7a23a8f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/64957
+	PR debug/64817
+	* simplify-rtx.c (simplify_binary_operation_1): Use ~cval for
+	IOR rather than for AND.
+
 2015-02-06  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR target/62631
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 04452c6e447..a003b4179aa 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -2731,9 +2731,9 @@ simplify_binary_operation_1 (enum rtx_code code, machine_mode mode,
 	  HOST_WIDE_INT xcval;
 
 	  if (op == IOR)
-	    xcval = cval;
-	  else
 	    xcval = ~cval;
+	  else
+	    xcval = cval;
 
 	  return simplify_gen_binary (XOR, mode,
 				      simplify_gen_binary (op, mode, a, c),
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55715adca66..48a804f00a6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/64957
+	PR debug/64817
+	* gcc.c-torture/execute/pr64957.c: New test.
+
 2015-02-05  Jeff Law  <law@redhat.com>
 
 	PR target/17306
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr64957.c b/gcc/testsuite/gcc.c-torture/execute/pr64957.c
new file mode 100644
index 00000000000..2a70e172d37
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr64957.c
@@ -0,0 +1,23 @@
+/* PR rtl-optimization/64957 */
+
+__attribute__((noinline, noclone)) int
+foo (int b)
+{
+  return (((b ^ 5) | 1) ^ 5) | 1;
+}
+
+__attribute__((noinline, noclone)) int
+bar (int b)
+{
+  return (((b ^ ~5) & ~1) ^ ~5) & ~1;
+}
+
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 16; i++)
+    if (foo (i) != (i | 1) || bar (i) != (i & ~1))
+      __builtin_abort ();
+  return 0;
+}