Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / cfgcleanup.c

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 19e9fd5..338281a 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -1119,9 +1119,11 @@ outgoing_edges_match (mode, bb1, bb2)
   /* If BB1 has only one successor, we may be looking at either an
      unconditional jump, or a fake edge to exit.  */
   if (bb1->succ && !bb1->succ->succ_next
-      && !(bb1->succ->flags & (EDGE_COMPLEX | EDGE_FAKE)))
+      && (bb1->succ->flags & (EDGE_COMPLEX | EDGE_FAKE)) == 0
+      && (GET_CODE (bb1->end) != JUMP_INSN || simplejump_p (bb1->end)))
     return (bb2->succ &&  !bb2->succ->succ_next
-           && (bb2->succ->flags & (EDGE_COMPLEX | EDGE_FAKE)) == 0);
+           && (bb2->succ->flags & (EDGE_COMPLEX | EDGE_FAKE)) == 0
+           && (GET_CODE (bb2->end) != JUMP_INSN || simplejump_p (bb2->end)));
 
   /* Match conditional jumps - this may get tricky when fallthru and branch
      edges are crossed.  */
@@ -1143,17 +1145,6 @@ outgoing_edges_match (mode, bb1, bb2)
          || !onlyjump_p (bb2->end))
        return false;
 
-      /* Do not crossjump across loop boundaries.  This is a temporary
-        workaround for the common scenario in which crossjumping results
-        in killing the duplicated loop condition, making bb-reorder rotate
-        the loop incorrectly, leaving an extra unconditional jump inside
-        the loop.
-
-        This check should go away once bb-reorder knows how to duplicate
-        code in this case or rotate the loops to avoid this scenario.  */
-      if (bb1->loop_depth != bb2->loop_depth)
-       return false;
-
       b1 = BRANCH_EDGE (bb1);
       b2 = BRANCH_EDGE (bb2);
       f1 = FALLTHRU_EDGE (bb1);