2004-09-24 Ben Elliston <bje@au.ibm.com>

[pf3gnuchains/gcc-fork.git] / gcc / tree-ssa-loop-unswitch.c

diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index f104075..d4ab192 100644 (file)
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -172,10 +172,10 @@ simplify_using_entry_checks (struct loop *loop, tree cond)
                ? boolean_true_node
                : boolean_false_node);
 
-      if (e->src->pred->pred_next)
+      if (EDGE_COUNT (e->src->preds) > 1)
        return cond;
 
-      e = e->src->pred;
+      e = EDGE_PRED (e->src, 0);
       if (e->src == ENTRY_BLOCK_PTR)
        return cond;
     }
@@ -283,9 +283,7 @@ tree_unswitch_loop (struct loops *loops, struct loop *loop,
 
   /* Some sanity checking.  */
   gcc_assert (flow_bb_inside_loop_p (loop, unswitch_on));
-  gcc_assert (unswitch_on->succ != NULL);
-  gcc_assert (unswitch_on->succ->succ_next != NULL);
-  gcc_assert (unswitch_on->succ->succ_next->succ_next == NULL);
+  gcc_assert (EDGE_COUNT (unswitch_on->succs) == 2);
   gcc_assert (loop->inner == NULL);
 
   return tree_ssa_loop_version (loops, loop, unshare_expr (cond),