PR middle-end/27478

[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 1736269..d9102b2 100644 (file)
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -80,7 +80,7 @@ static tree tree_may_unswitch_on (basic_block, struct loop *);
 
 /* Main entry point.  Perform loop unswitching on all suitable LOOPS.  */
 
-void
+unsigned int
 tree_ssa_unswitch_loops (struct loops *loops)
 {
   int i, num;
@@ -104,7 +104,8 @@ tree_ssa_unswitch_loops (struct loops *loops)
     }
 
   if (changed)
-    cleanup_tree_cfg_loop ();
+    return TODO_cleanup_cfg;
+  return 0;
 }
 
 /* Checks whether we can unswitch LOOP on condition at end of BB -- one of its
@@ -253,7 +254,11 @@ tree_unswitch_single_loop (struct loops *loops, struct loop *loop, int num)
   /* Unswitch the loop on this condition.  */
   nloop = tree_unswitch_loop (loops, loop, bbs[i], cond);
   if (!nloop)
-    return changed;
+    {
+      free_original_copy_tables ();
+      free (bbs);
+      return changed;
+    }
 
   /* Update the SSA form after unswitching.  */
   update_ssa (TODO_update_ssa);
@@ -262,6 +267,7 @@ tree_unswitch_single_loop (struct loops *loops, struct loop *loop, int num)
   /* Invoke itself on modified loops.  */
   tree_unswitch_single_loop (loops, nloop, num + 1);
   tree_unswitch_single_loop (loops, loop, num + 1);
+  free (bbs);
   return true;
 }
 
@@ -282,5 +288,5 @@ tree_unswitch_loop (struct loops *loops, struct loop *loop,
   gcc_assert (loop->inner == NULL);
 
   return loop_version (loops, loop, unshare_expr (cond), 
-                      &condition_bb);
+                      &condition_bb, false);
 }