* cfgrtl.c (purge_all_dead_edge): Remove an unused argument.

	* basic-block.h: Update the prototype for
	purge_all_dead_edges.
	* cfgexpand.c (tree_expand_cfg): Update a call to
	purge_all_dead_edges.
	* combine.c (combine_instructions): Likewise.
	* passes.c (rest_of_handle_old_regalloc, rest_of_handle_cse,
	rest_of_handle_cse2, rest_of_handle_gcse,
	rest_of_handle_postreload): likewise.


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

6 files changed, 21 insertions, 25 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f06d0597ba5..2aaf5174416 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-15  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* cfgrtl.c (purge_all_dead_edge): Remove an unused argument.
+	* basic-block.h: Update the prototype for
+	purge_all_dead_edges.
+	* cfgexpand.c (tree_expand_cfg): Update a call to
+	purge_all_dead_edges.
+	* combine.c (combine_instructions): Likewise.
+	* passes.c (rest_of_handle_old_regalloc, rest_of_handle_cse,
+	rest_of_handle_cse2, rest_of_handle_gcse,
+	rest_of_handle_postreload): likewise.
+
 2005-04-15  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR middle-end/20739
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 2527640f707..fcaa9a952aa 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -861,7 +861,7 @@ extern int delete_noop_moves (void);
 extern basic_block force_nonfallthru (edge);
 extern rtx block_label (basic_block);
 extern bool forwarder_block_p (basic_block);
-extern bool purge_all_dead_edges (int);
+extern bool purge_all_dead_edges (void);
 extern bool purge_dead_edges (basic_block);
 extern void find_many_sub_basic_blocks (sbitmap);
 extern void rtl_make_eh_edge (sbitmap, basic_block, rtx);
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index e339505596f..f7a2f1e1439 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -1320,7 +1320,7 @@ tree_expand_cfg (void)
   blocks = sbitmap_alloc (last_basic_block);
   sbitmap_ones (blocks);
   find_many_sub_basic_blocks (blocks);
-  purge_all_dead_edges (0);
+  purge_all_dead_edges ();
   sbitmap_free (blocks);
 
   compact_blocks ();
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 0f8d5ebff7f..26460488621 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -2455,34 +2455,18 @@ purge_dead_edges (basic_block bb)
    true if some edge has been eliminated.  */
 
 bool
-purge_all_dead_edges (int update_life_p)
+purge_all_dead_edges (void)
 {
   int purged = false;
-  sbitmap blocks = 0;
   basic_block bb;
 
-  if (update_life_p)
-    {
-      blocks = sbitmap_alloc (last_basic_block);
-      sbitmap_zero (blocks);
-    }
-
   FOR_EACH_BB (bb)
     {
       bool purged_here = purge_dead_edges (bb);
 
       purged |= purged_here;
-      if (purged_here && update_life_p)
-	SET_BIT (blocks, bb->index);
     }
 
-  if (update_life_p && purged)
-    update_life_info (blocks, UPDATE_LIFE_GLOBAL,
-		      PROP_DEATH_NOTES | PROP_SCAN_DEAD_CODE
-		      | PROP_KILL_DEAD_CODE);
-
-  if (update_life_p)
-    sbitmap_free (blocks);
   return purged;
 }
 
diff --git a/gcc/combine.c b/gcc/combine.c
index 89866e0fa3d..96f33201372 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -886,7 +886,7 @@ combine_instructions (rtx f, unsigned int nregs)
 
   EXECUTE_IF_SET_IN_SBITMAP (refresh_blocks, 0, i,
 			     BASIC_BLOCK (i)->flags |= BB_DIRTY);
-  new_direct_jump_p |= purge_all_dead_edges (0);
+  new_direct_jump_p |= purge_all_dead_edges ();
   delete_noop_moves ();
 
   update_life_info_in_dirty_blocks (UPDATE_LIFE_GLOBAL_RM_NOTES,
diff --git a/gcc/passes.c b/gcc/passes.c
index c2cbefb0fa2..d210bcf5592 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -459,7 +459,7 @@ rest_of_handle_old_regalloc (void)
       timevar_push (TV_JUMP);
 
       rebuild_jump_labels (get_insns ());
-      purge_all_dead_edges (0);
+      purge_all_dead_edges ();
       delete_unreachable_blocks ();
 
       timevar_pop (TV_JUMP);
@@ -978,7 +978,7 @@ rest_of_handle_cse (void)
   tem = cse_main (get_insns (), max_reg_num (), dump_file);
   if (tem)
     rebuild_jump_labels (get_insns ());
-  if (purge_all_dead_edges (0))
+  if (purge_all_dead_edges ())
     delete_unreachable_blocks ();
 
   delete_trivially_dead_insns (get_insns (), max_reg_num ());
@@ -1018,7 +1018,7 @@ rest_of_handle_cse2 (void)
      bypassed safely.  */
   cse_condition_code_reg ();
 
-  purge_all_dead_edges (0);
+  purge_all_dead_edges ();
   delete_trivially_dead_insns (get_insns (), max_reg_num ());
 
   if (tem)
@@ -1061,7 +1061,7 @@ rest_of_handle_gcse (void)
       timevar_push (TV_CSE);
       reg_scan (get_insns (), max_reg_num ());
       tem2 = cse_main (get_insns (), max_reg_num (), dump_file);
-      purge_all_dead_edges (0);
+      purge_all_dead_edges ();
       delete_trivially_dead_insns (get_insns (), max_reg_num ());
       timevar_pop (TV_CSE);
       cse_not_expected = !flag_rerun_cse_after_loop;
@@ -1409,7 +1409,7 @@ rest_of_handle_postreload (void)
   /* reload_cse_regs can eliminate potentially-trapping MEMs.
      Remove any EH edges associated with them.  */
   if (flag_non_call_exceptions)
-    purge_all_dead_edges (0);
+    purge_all_dead_edges ();
 
   close_dump_file (DFI_postreload, print_rtl_with_bb, get_insns ());
   timevar_pop (TV_RELOAD_CSE_REGS);