PR java/19295

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

diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 4d25d0f..e307528 100644 (file)
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -59,19 +59,16 @@ should_duplicate_loop_header_p (basic_block header, struct loop *loop,
   if (header->aux)
     return false;
 
-  gcc_assert (header->succ);
-  if (!header->succ->succ_next)
+  gcc_assert (EDGE_COUNT (header->succs) > 0);
+  if (EDGE_COUNT (header->succs) == 1)
     return false;
-  if (header->succ->succ_next->succ_next)
-    return false;
-  if (flow_bb_inside_loop_p (loop, header->succ->dest)
-      && flow_bb_inside_loop_p (loop, header->succ->succ_next->dest))
+  if (flow_bb_inside_loop_p (loop, EDGE_SUCC (header, 0)->dest)
+      && flow_bb_inside_loop_p (loop, EDGE_SUCC (header, 1)->dest))
     return false;
 
   /* If this is not the original loop header, we want it to have just
      one predecessor in order to match the && pattern.  */
-  if (header != loop->header
-      && header->pred->pred_next)
+  if (header != loop->header && EDGE_COUNT (header->preds) >= 2)
     return false;
 
   last = last_stmt (header);
@@ -155,6 +152,8 @@ copy_loop_headers (void)
       int limit = 20;
 
       loop = loops->parray[i];
+      if (!loop)
+       continue;
       header = loop->header;
 
       /* If the loop is already a do-while style one (either because it was
@@ -176,10 +175,10 @@ copy_loop_headers (void)
        {
          /* Find a successor of header that is inside a loop; i.e. the new
             header after the condition is copied.  */
-         if (flow_bb_inside_loop_p (loop, header->succ->dest))
-           exit = header->succ;
+         if (flow_bb_inside_loop_p (loop, EDGE_SUCC (header, 0)->dest))
+           exit = EDGE_SUCC (header, 0);
          else
-           exit = header->succ->succ_next;
+           exit = EDGE_SUCC (header, 1);
          bbs[n_bbs++] = header;
          header = exit->dest;
        }
@@ -194,8 +193,8 @@ copy_loop_headers (void)
 
       /* Ensure that the header will have just the latch as a predecessor
         inside the loop.  */
-      if (exit->dest->pred->pred_next)
-       exit = loop_split_edge_with (exit, NULL)->succ;
+      if (EDGE_COUNT (exit->dest->preds) > 1)
+       exit = EDGE_SUCC (loop_split_edge_with (exit, NULL), 0);
 
       if (!tree_duplicate_sese_region (loop_preheader_edge (loop), exit,
                                       bbs, n_bbs, NULL))
@@ -217,11 +216,6 @@ copy_loop_headers (void)
 #endif
 
   loop_optimizer_finalize (loops, NULL);
-
-  /* Run cleanup_tree_cfg here regardless of whether we have done anything, so
-     that we cleanup the blocks created in order to get the loops into a
-     canonical shape.  */
-  cleanup_tree_cfg ();
 }
 
 static bool
@@ -243,7 +237,7 @@ struct tree_opt_pass pass_ch =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  (TODO_dump_func
-   | TODO_verify_ssa),                 /* todo_flags_finish */
+  TODO_cleanup_cfg | TODO_dump_func 
+  | TODO_verify_ssa,                   /* todo_flags_finish */
   0                                    /* letter */
 };