2013-03-05 Richard Biener <rguenther@suse.de>

	PR middle-end/56525
	* loop-init.c (fix_loop_structure): Remove loops in two stages,
	not freeing them until the end.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196462 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 3 deletions

diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index b1954ca484f..f75493817bb 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -186,7 +186,7 @@ fix_loop_structure (bitmap changed_bbs)
   int record_exits = 0;
   loop_iterator li;
   struct loop *loop;
-  unsigned old_nloops;
+  unsigned old_nloops, i;
 
   timevar_push (TV_LOOP_INIT);
 
@@ -230,8 +230,9 @@ fix_loop_structure (bitmap changed_bbs)
 	  flow_loop_tree_node_add (loop_outer (loop), ploop);
 	}
 
-      /* Remove the loop and free its data.  */
-      delete_loop (loop);
+      /* Remove the loop.  */
+      loop->header = NULL;
+      flow_loop_tree_node_remove (loop);
     }
 
   /* Remember the number of loops so we can return how many new loops
@@ -253,6 +254,14 @@ fix_loop_structure (bitmap changed_bbs)
 	}
     }
 
+  /* Finally free deleted loops.  */
+  FOR_EACH_VEC_ELT (*get_loops (), i, loop)
+    if (loop && loop->header == NULL)
+      {
+	(*get_loops ())[i] = NULL;
+	flow_loop_free (loop);
+      }
+
   loops_state_clear (LOOPS_NEED_FIXUP);
 
   /* Apply flags to loops.  */