[RTL-ifcvt] PR rtl-optimization/68506: Fix emitting order of insns in IF-THEN-JOIN...

	PR rtl-optimization/68506
	* ifcvt.c (noce_try_cmove_arith): Try emitting the else basic block
	first if emit_a exists or then_bb modifies 'b'.  Reindent if-else
	blocks.

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

From-SVN: r231003

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 24fb40f..9278a0c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-27  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR rtl-optimization/68506
+       * ifcvt.c (noce_try_cmove_arith): Try emitting the else basic block
+       first if emit_a exists or then_bb modifies 'b'.  Reindent if-else
+       blocks.
+
 2015-11-27  Martin Liska  <mliska@suse.cz>
 
        PR c++/68312

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index fc724bc..8ece873 100644 (file)
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -2190,40 +2190,38 @@ noce_try_cmove_arith (struct noce_if_info *if_info)
          }
 
     }
-    if (emit_a && modified_in_a)
-      {
-       modified_in_b = emit_b != NULL_RTX && modified_in_p (orig_a, emit_b);
-       if (tmp_b && else_bb)
-         {
-           FOR_BB_INSNS (else_bb, tmp_insn)
-           /* Don't check inside insn_b.  We will have changed it to emit_b
-              with a destination that doesn't conflict.  */
-             if (!(insn_b && tmp_insn == insn_b)
-                 && modified_in_p (orig_a, tmp_insn))
-               {
-                 modified_in_b = true;
-                 break;
-               }
-
-         }
-       if (modified_in_b)
-         goto end_seq_and_fail;
-
-       if (!noce_emit_bb (emit_b, else_bb, b_simple))
-         goto end_seq_and_fail;
+  if (emit_a || modified_in_a)
+    {
+      modified_in_b = emit_b != NULL_RTX && modified_in_p (orig_a, emit_b);
+      if (tmp_b && else_bb)
+       {
+         FOR_BB_INSNS (else_bb, tmp_insn)
+         /* Don't check inside insn_b.  We will have changed it to emit_b
+            with a destination that doesn't conflict.  */
+         if (!(insn_b && tmp_insn == insn_b)
+             && modified_in_p (orig_a, tmp_insn))
+           {
+             modified_in_b = true;
+             break;
+           }
+       }
+      if (modified_in_b)
+       goto end_seq_and_fail;
 
-       if (!noce_emit_bb (emit_a, then_bb, a_simple))
-         goto end_seq_and_fail;
-      }
-    else
-      {
-       if (!noce_emit_bb (emit_a, then_bb, a_simple))
-         goto end_seq_and_fail;
+      if (!noce_emit_bb (emit_b, else_bb, b_simple))
+       goto end_seq_and_fail;
 
-       if (!noce_emit_bb (emit_b, else_bb, b_simple))
-         goto end_seq_and_fail;
+      if (!noce_emit_bb (emit_a, then_bb, a_simple))
+       goto end_seq_and_fail;
+    }
+  else
+    {
+      if (!noce_emit_bb (emit_a, then_bb, a_simple))
+       goto end_seq_and_fail;
 
-      }
+      if (!noce_emit_bb (emit_b, else_bb, b_simple))
+       goto end_seq_and_fail;
+    }
 
   target = noce_emit_cmove (if_info, x, code, XEXP (if_info->cond, 0),
                            XEXP (if_info->cond, 1), a, b);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e946a6f..05aa372 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-27  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR rtl-optimization/68506
+       * gcc.c-torture/execute/pr68506.c: New test.
+
 2015-11-27  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/63326

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr68506.c b/gcc/testsuite/gcc.c-torture/execute/pr68506.c
new file mode 100644 (file)
index 0000000..15984ed
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr68506.c
@@ -0,0 +1,63 @@
+/* { dg-options "-fno-builtin-abort" } */
+
+int a, b, m, n, o, p, s, u, i;
+char c, q, y;
+short d;
+unsigned char e;
+static int f, h;
+static short g, r, v;
+unsigned t;
+
+extern void abort ();
+
+int
+fn1 (int p1)
+{
+  return a ? p1 : p1 + a;
+}
+
+unsigned char
+fn2 (unsigned char p1, int p2)
+{
+  return p2 >= 2 ? p1 : p1 >> p2;
+}
+
+static short
+fn3 ()
+{
+  int w, x = 0;
+  for (; p < 31; p++)
+    {
+      s = fn1 (c | ((1 && c) == c));
+      t = fn2 (s, x);
+      c = (unsigned) c > -(unsigned) ((o = (m = d = t) == p) <= 4UL) && n;
+      v = -c;
+      y = 1;
+      for (; y; y++)
+       e = v == 1;
+      d = 0;
+      for (; h != 2;)
+       {
+         for (;;)
+           {
+             if (!m)
+               abort ();
+             r = 7 - f;
+             x = e = i | r;
+             q = u * g;
+             w = b == q;
+             if (w)
+               break;
+           }
+         break;
+       }
+    }
+  return x;
+}
+
+int
+main ()
+{
+  fn3 ();
+  return 0;
+}