2005-05-03 Andrew MacLeod <amacleod@redhat.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 d406fb5..cb235f0 100644 (file)
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -1,5 +1,5 @@
 /* Loop unswitching.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
    
 This file is part of GCC.
    
@@ -101,10 +101,6 @@ tree_ssa_unswitch_loops (struct loops *loops)
        continue;
 
       changed |= tree_unswitch_single_loop (loops, loop, 0);
-#ifdef ENABLE_CHECKING
-      verify_dominators (CDI_DOMINATORS);
-      verify_loop_structure (loops);
-#endif
     }
 
   if (changed)
@@ -117,10 +113,9 @@ tree_ssa_unswitch_loops (struct loops *loops)
 static tree
 tree_may_unswitch_on (basic_block bb, struct loop *loop)
 {
-  tree stmt, def, cond;
+  tree stmt, def, cond, use;
   basic_block def_bb;
-  use_optype uses;
-  unsigned i;
+  ssa_op_iter iter;
 
   /* BB must end in a simple conditional jump.  */
   stmt = last_stmt (bb);
@@ -128,11 +123,9 @@ tree_may_unswitch_on (basic_block bb, struct loop *loop)
     return NULL_TREE;
 
   /* Condition must be invariant.  */
-  get_stmt_operands (stmt);
-  uses = STMT_USE_OPS (stmt);
-  for (i = 0; i < NUM_USES (uses); i++)
+  FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, SSA_OP_USE)
     {
-      def = SSA_NAME_DEF_STMT (USE_OP (uses, i));
+      def = SSA_NAME_DEF_STMT (use);
       def_bb = bb_for_stmt (def);
       if (def_bb
          && flow_bb_inside_loop_p (loop, def_bb))
@@ -169,10 +162,10 @@ simplify_using_entry_checks (struct loop *loop, tree cond)
                ? boolean_true_node
                : boolean_false_node);
 
-      if (EDGE_COUNT (e->src->preds) > 1)
+      if (!single_pred_p (e->src))
        return cond;
 
-      e = EDGE_PRED (e->src, 0);
+      e = single_pred_edge (e->src);
       if (e->src == ENTRY_BLOCK_PTR)
        return cond;
     }
@@ -249,7 +242,7 @@ tree_unswitch_single_loop (struct loops *loops, struct loop *loop, int num)
       else
        break;
 
-      modify_stmt (stmt);
+      update_stmt (stmt);
       i++;
     }
 
@@ -261,6 +254,9 @@ tree_unswitch_single_loop (struct loops *loops, struct loop *loop, int num)
   if (!nloop)
     return changed;
 
+  /* Update the SSA form after unswitching.  */
+  update_ssa (TODO_update_ssa);
+
   /* Invoke itself on modified loops.  */
   tree_unswitch_single_loop (loops, nloop, num + 1);
   tree_unswitch_single_loop (loops, loop, num + 1);
@@ -283,6 +279,6 @@ tree_unswitch_loop (struct loops *loops, struct loop *loop,
   gcc_assert (EDGE_COUNT (unswitch_on->succs) == 2);
   gcc_assert (loop->inner == NULL);
 
-  return tree_ssa_loop_version (loops, loop, unshare_expr (cond), 
-                               &condition_bb);
+  return loop_version (loops, loop, unshare_expr (cond), 
+                      &condition_bb);
 }