revert: [multiple changes]

2013-04-05  Andrey Belevantsev  <abel@ispras.ru>

        Revert
        2013-04-01  Andrey Belevantsev  <abel@ispras.ru>

        Backport from mainline
        2013-02-25  Andrey Belevantsev  <abel@ispras.ru>
        Alexander Monakov  <amonakov@ispras.ru>

        PR middle-end/56077
        * sched-deps.c (sched_analyze_insn): When reg_pending_barrier,
        flush pending lists also on non-jumps.  Adjust comment.

From-SVN: r197509

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 57e0196e97f94d94000fdcfd5ba5a9a3650ee2f7..2d462e05ad54afc06d05c5f08a003372b8051088 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-05  Andrey Belevantsev  <abel@ispras.ru>
+
+       Revert
+       2013-04-01  Andrey Belevantsev  <abel@ispras.ru>
+
+       Backport from mainline
+       2013-02-25  Andrey Belevantsev  <abel@ispras.ru>
+       Alexander Monakov  <amonakov@ispras.ru>
+
+       PR middle-end/56077
+       * sched-deps.c (sched_analyze_insn): When reg_pending_barrier,
+       flush pending lists also on non-jumps.  Adjust comment.
+
 2013-04-04  Andrey Belevantsev  <abel@ispras.ru>
 
        Backport from mainline

diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 12f87a311afd0adebd4948f0c546251db99c7406..50494cfc23f45dcbf86fa03019e384a54ac2238d 100644 (file)
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -3042,9 +3042,9 @@ sched_analyze_insn (struct deps_desc *deps, rtx x, rtx insn)
             SET_REGNO_REG_SET (&deps->reg_last_in_use, i);
           }
 
-      /* Don't flush pending lists on speculative checks for
-        selective scheduling.  */
-      if (!sel_sched_p () || !sel_insn_is_speculation_check (insn))
+      /* Flush pending lists on jumps, but not on speculative checks.  */
+      if (JUMP_P (insn) && !(sel_sched_p ()
+                             && sel_insn_is_speculation_check (insn)))
        flush_pending_lists (deps, insn, true, true);
 
       if (!deps->readonly)