[ARM] Fix PR target/69403: Bug in thumb2_ior_scc_strict_it pattern

	Backport from mainline
	2016-01-22  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	PR target/69403
	* config/arm/thumb2.md (*thumb2_ior_scc_strict_it): Convert to
	define_insn_and_split.  Ensure operands[1] and operands[0] do not
	get assigned the same register.

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

From-SVN: r232734

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d91fa3b436f7228d9185383e1d7d4559f20105d..c452260a7817dcee95f11744465d69c0a4830c70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2016-01-22  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       Backport from mainline
+       2016-01-22  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR target/69403
+       * config/arm/thumb2.md (*thumb2_ior_scc_strict_it): Convert to
+       define_insn_and_split.  Ensure operands[1] and operands[0] do not
+       get assigned the same register.
+
 2016-01-22  Bernd Schmidt <bschmidt@redhat.com>
 
        PR target/63681

diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md
index d84938f304e32940dc1b44c98581e506a2fce01a..1411a6816abce17de0f78a5ef8419b28716f9d7e 100644 (file)
--- a/gcc/config/arm/thumb2.md
+++ b/gcc/config/arm/thumb2.md
@@ -642,15 +642,27 @@
    (set_attr "type" "multiple")]
 )
 
-(define_insn "*thumb2_ior_scc_strict_it"
-  [(set (match_operand:SI 0 "s_register_operand" "=l,l")
+(define_insn_and_split "*thumb2_ior_scc_strict_it"
+  [(set (match_operand:SI 0 "s_register_operand" "=&r")
        (ior:SI (match_operator:SI 2 "arm_comparison_operator"
                 [(match_operand 3 "cc_register" "") (const_int 0)])
-               (match_operand:SI 1 "s_register_operand" "0,?l")))]
+               (match_operand:SI 1 "s_register_operand" "r")))]
   "TARGET_THUMB2 && arm_restrict_it"
-  "@
-   it\\t%d2\;mov%d2\\t%0, #1\;it\\t%d2\;orr%d2\\t%0, %1
-   mov\\t%0, #1\;orr\\t%0, %1\;it\\t%D2\;mov%D2\\t%0, %1"
+  "#" ; orr\\t%0, %1, #1\;it\\t%D2\;mov%D2\\t%0, %1
+  "&& reload_completed"
+  [(set (match_dup 0) (ior:SI (match_dup 1) (const_int 1)))
+   (cond_exec (match_dup 4)
+     (set (match_dup 0) (match_dup 1)))]
+  {
+    machine_mode mode = GET_MODE (operands[3]);
+    rtx_code rc = GET_CODE (operands[2]);
+
+    if (mode == CCFPmode || mode == CCFPEmode)
+      rc = reverse_condition_maybe_unordered (rc);
+    else
+      rc = reverse_condition (rc);
+    operands[4] = gen_rtx_fmt_ee (rc, VOIDmode, operands[3], const0_rtx);
+  }
   [(set_attr "conds" "use")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e0ef361ba8ae276302a8724eba55fbd60291def..3288254667a762964d5f0c2e8a615dc03045fe22 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2016-01-22  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       Backport from mainline
+       2016-01-22  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR target/69403
+       * gcc.c-torture/execute/pr69403.c: New test.
+
 2016-01-21  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
 
        Backported from mainline

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr69403.c b/gcc/testsuite/gcc.c-torture/execute/pr69403.c
new file mode 100644 (file)
index 0000000..097d366
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr69403.c
@@ -0,0 +1,20 @@
+/* PR target/69403.  */
+
+int a, b, c;
+
+__attribute__ ((__noinline__)) int
+fn1 ()
+{
+  if ((b | (a != (a & c))) == 1)
+    __builtin_abort ();
+  return 0;
+}
+
+int
+main (void)
+{
+  a = 5;
+  c = 1;
+  b = 6;
+  return fn1 ();
+}