rtl.h (NOTE_BLOCK_NUMBER): Replace with ...

	* rtl.h (NOTE_BLOCK_NUMBER): Replace with ...
	(NOTE_BLOCK): New macro.
	(NOTE_BLOCK_LIVE_RANGE_BLOCK): Remove.
	* function.h (identify_blocks): CHange prototype.
	* function.c (identify_blocks): Simplify.
	(reorder_blocks): Likewise.
	* ggc-common.c (ggc_mark_rtx): Mark the BLOCK associated with a
	NOTE_INSN_BLOCK_{BEG,END}.
	* haifa-sched.c (sched_analyze): Don't put NOTE_BLOCK_NUMBER on
	the list of saved notes if the note isn't a
	NOTE_INSN_BLOCK_{BEG,END}.
	(move_insn1): Use NOTE_EH_HANDLER in comment, rather than
	NOTE_BLOCK_NUMBER.
	(reemit_notes): Adjust recreation of notes to reflect new saved
	note structure.
	* print-rtl.c (print_rtx): Print the address of the BLOCK when
	printing a block note.
	* stmt.c (block_vector): Remove.
	(find_loop_tree_blocks): Simplify.
	(unroll_block_trees): Likewise.

From-SVN: r29441

1 files changed, 2 insertions, 15 deletions

diff --git a/gcc/stmt.c b/gcc/stmt.c
index 22ddac8..068803c 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -6278,19 +6278,10 @@ emit_case_nodes (index, node, default_label, index_type)
 /* These routines are used by the loop unrolling code.  They copy BLOCK trees
    so that the debugging info will be correct for the unrolled loop.  */
 
-/* Indexed by block number, contains a pointer to the N'th block node.
-
-  Allocated by the call to identify_blocks, then released after the call
-  to reorder_blocks in the function unroll_block_trees.  */
-
-static tree *block_vector;
-
 void
 find_loop_tree_blocks ()
 {
-  tree block = DECL_INITIAL (current_function_decl);
-
-  block_vector = identify_blocks (block, get_insns ());
+  identify_blocks (DECL_INITIAL (current_function_decl), get_insns ());
 }
 
 void
@@ -6298,9 +6289,5 @@ unroll_block_trees ()
 {
   tree block = DECL_INITIAL (current_function_decl);
 
-  reorder_blocks (block_vector, block, get_insns ());
-
-  /* Release any memory allocated by identify_blocks.  */
-  if (block_vector)
-    free (block_vector);
+  reorder_blocks (block, get_insns ());
 }