* i386.c (ix86_expand_int_movcc): Cleanup; use expand_simple_*op.

	* toplev.c (rest_of_compilation): Use CLEANUP_UPDATE_LIFE
	to avoid update_life_info call.
	* basic-block.h (CLEANUP_UPATE_LIFE): Define.
	* cfgcleanup.c (bb_flags): New enum.
	(BB_FLAGS, BB_SET_FLAG, BB_CLEAR_FLAG, FORWARDER_BLOCK_P): New macros.
	(notice_new_block, update_forwarder_flag): New functions.
	(try_simplify_condjump): Use FORWARDER_BLOCK_P.
	(try_forward_edges): Likewise; update flags.
	(merge_blocks): Likewise.
	(outgoing_edges_match): Likewise.
	(try_crossjump_to_edge): Likewise.
	(try_optimize_cfg): Likewise; initialize and clear the flags;
	recompute life info if needed.
	(cleanup_cfg): No need to clear aux pointers.


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

1 files changed, 1 insertions, 14 deletions

diff --git a/gcc/toplev.c b/gcc/toplev.c
index ca77de7ad08..1320013cb47 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -3309,20 +3309,7 @@ rest_of_compilation (decl)
 	  rebuild_jump_labels (insns);
 	  timevar_pop (TV_JUMP);
 
-	  timevar_push (TV_FLOW);
-	  cleanup_cfg (CLEANUP_EXPENSIVE);
-
-	  /* Blimey.  We've got to have the CFG up to date for the call to
-	     if_convert below.  However, the random deletion of blocks
-	     without updating life info can wind up with Wierd Stuff in
-	     global_live_at_end.  We then run sched1, which updates things
-	     properly, discovers the wierdness and aborts.  */
-	  allocate_bb_life_data ();
-	  update_life_info (NULL, UPDATE_LIFE_GLOBAL_RM_NOTES,
-			    PROP_DEATH_NOTES | PROP_KILL_DEAD_CODE
-			    | PROP_SCAN_DEAD_CODE);
-
-	  timevar_pop (TV_FLOW);
+	  cleanup_cfg (CLEANUP_EXPENSIVE | CLEANUP_UPDATE_LIFE);
 	}
 
       close_dump_file (DFI_combine, print_rtl_with_bb, insns);