[ARM][4.9 backport] Fix PR target/68648

	PR target/68648
	* config/arm/arm.md (*andsi_iorsi3_notsi): Try to simplify
	the complement of operands[3] during splitting.

	* gcc.dg/torture/pr68648.c: New test.

From-SVN: r232375

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 305392cacc2da46411f4eed2927413ac67c3e914..a69e93799ddcbcb8647267f3e166a7671a869770 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-14  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR target/68648
+       * config/arm/arm.md (*andsi_iorsi3_notsi): Try to simplify
+       the complement of operands[3] during splitting.
+
 2016-01-12  Jeff Law  <law@redhat.com>
 
        PR target/63347

diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 3bb8aef36f7ed54faeeb05f4b2b9825d96162f54..138d17e8d7dec2c38c4daa531b46be3e0ce88cea 100644 (file)
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -3331,8 +3331,22 @@
   "#"   ; "orr%?\\t%0, %1, %2\;bic%?\\t%0, %0, %3"
   "&& reload_completed"
   [(set (match_dup 0) (ior:SI (match_dup 1) (match_dup 2)))
-   (set (match_dup 0) (and:SI (not:SI (match_dup 3)) (match_dup 0)))]
-  ""
+   (set (match_dup 0) (and:SI (match_dup 4) (match_dup 5)))]
+  {
+     /* If operands[3] is a constant make sure to fold the NOT into it
+       to avoid creating a NOT of a CONST_INT.  */
+    rtx not_rtx = simplify_gen_unary (NOT, SImode, operands[3], SImode);
+    if (CONST_INT_P (not_rtx))
+      {
+       operands[4] = operands[0];
+       operands[5] = not_rtx;
+      }
+    else
+      {
+       operands[5] = operands[0];
+       operands[4] = not_rtx;
+      }
+  }
   [(set_attr "length" "8")
    (set_attr "ce_count" "2")
    (set_attr "predicable" "yes")

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c6fb9be7951269ed1eb7462f3ff89fafcae1d4e9..36e67994c53831103f9e6f2cbb00c4875476e757 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-14  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR target/68648
+       * gcc.dg/torture/pr68648.c: New test.
+
 2016-01-12  Jeff Law  <law@redhat.com>
 
        PR target/63347

diff --git a/gcc/testsuite/gcc.dg/torture/pr68648.c b/gcc/testsuite/gcc.dg/torture/pr68648.c
new file mode 100644 (file)
index 0000000..762eb82
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr68648.c
@@ -0,0 +1,23 @@
+/* { dg-do run } */
+/* { dg-options "-std=gnu99" } */
+
+int __attribute__ ((noinline))
+foo (void)
+{
+  return 123;
+}
+
+int __attribute__ ((noinline))
+bar (void)
+{
+  int c = 1;
+  c |= 4294967295 ^ (foo () | 4073709551608);
+  return c;
+}
+
+int
+main ()
+{
+  if (bar () != 0x83fd4005)
+    __builtin_abort ();
+}