* flow.c (cleanup_cfg): Take no argument.

        * output.h, sibcall.c, toplev.c: Update all calls.


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

5 files changed, 15 insertions, 13 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de13830884d..8f3c6c2a545 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -34,6 +34,9 @@
 	* reg-stack.c (convert_regs_1): Kill the entire target stack
 	across non-call exception edges.
 
+	* flow.c (cleanup_cfg): Take no argument.
+	* output.h, sibcall.c, toplev.c: Update all calls.
+
 2001-03-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in: Don't check for bcopy.
diff --git a/gcc/flow.c b/gcc/flow.c
index e8bf0400262..75dc09c4b74 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -1044,12 +1044,11 @@ find_basic_blocks_1 (f)
 /* Tidy the CFG by deleting unreachable code and whatnot.  */
 
 void
-cleanup_cfg (f)
-     rtx f;
+cleanup_cfg ()
 {
   delete_unreachable_blocks ();
   move_stray_eh_region_notes ();
-  record_active_eh_regions (f);
+  record_active_eh_regions (get_insns ());
   try_merge_blocks ();
   mark_critical_edges ();
 
diff --git a/gcc/output.h b/gcc/output.h
index d50b795c8c8..7a5f10e82c9 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -133,7 +133,7 @@ extern int regno_uninitialized		PARAMS ((int));
 extern int regno_clobbered_at_setjmp	PARAMS ((int));
 extern void dump_flow_info		PARAMS ((FILE *));
 extern void find_basic_blocks		PARAMS ((rtx, int, FILE *));
-extern void cleanup_cfg			PARAMS ((rtx));
+extern void cleanup_cfg			PARAMS ((void));
 extern void free_basic_block_vars     PARAMS ((int));
 extern void set_block_num             PARAMS ((rtx, int));
 extern void check_function_return_warnings PARAMS ((void));
diff --git a/gcc/sibcall.c b/gcc/sibcall.c
index e00e8b790d6..13f9c1f0069 100644
--- a/gcc/sibcall.c
+++ b/gcc/sibcall.c
@@ -514,7 +514,7 @@ optimize_sibling_and_tail_recursive_calls ()
   /* We need cfg information to determine which blocks are succeeded
      only by the epilogue.  */
   find_basic_blocks (insns, max_reg_num (), 0);
-  cleanup_cfg (insns);
+  cleanup_cfg ();
 
   /* If there are no basic blocks, then there is nothing to do.  */
   if (n_basic_blocks == 0)
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 573b6b660a6..6016ca6230b 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -2955,7 +2955,7 @@ rest_of_compilation (decl)
   if (optimize > 0)
     {
       find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
-      cleanup_cfg (insns);
+      cleanup_cfg ();
 
       /* ??? Run if-conversion before delete_null_pointer_checks,
          since the later does not preserve the CFG.  This should
@@ -3025,7 +3025,7 @@ rest_of_compilation (decl)
 	  timevar_push (TV_JUMP);
 	  find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
 
-	  cleanup_cfg (insns);
+	  cleanup_cfg ();
 
 	  delete_null_pointer_checks (insns);
 	  timevar_pop (TV_JUMP);
@@ -3056,7 +3056,7 @@ rest_of_compilation (decl)
       open_dump_file (DFI_ssa, decl);
 
       find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
-      cleanup_cfg (insns);
+      cleanup_cfg ();
       convert_to_ssa ();
 
       close_dump_file (DFI_ssa, print_rtl_with_bb, insns);
@@ -3111,7 +3111,7 @@ rest_of_compilation (decl)
       open_dump_file (DFI_gcse, decl);
 
       find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
-      cleanup_cfg (insns);
+      cleanup_cfg ();
       tem = gcse_main (insns, rtl_dump_file);
 
       save_csb = flag_cse_skip_blocks;
@@ -3209,7 +3209,7 @@ rest_of_compilation (decl)
 	  timevar_push (TV_IFCVT);
 
 	  find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
-	  cleanup_cfg (insns);
+	  cleanup_cfg ();
 	  if_convert (0);
 
 	  timevar_pop(TV_IFCVT);
@@ -3255,7 +3255,7 @@ rest_of_compilation (decl)
   open_dump_file (DFI_cfg, decl);
 
   find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
-  cleanup_cfg (insns);
+  cleanup_cfg ();
   check_function_return_warnings ();
 
   close_dump_file (DFI_cfg, print_rtl_with_bb, insns);
@@ -3330,7 +3330,7 @@ rest_of_compilation (decl)
 
 	  timevar_push (TV_FLOW);
 	  find_basic_blocks (insns, max_reg_num (), rtl_dump_file);
-	  cleanup_cfg (insns);
+	  cleanup_cfg ();
 
 	  /* Blimey.  We've got to have the CFG up to date for the call to
 	     if_convert below.  However, the random deletion of blocks
@@ -3544,7 +3544,7 @@ rest_of_compilation (decl)
 
   if (optimize)
     {
-      cleanup_cfg (insns);
+      cleanup_cfg ();
       life_analysis (insns, rtl_dump_file, PROP_FINAL);
 
       /* This is kind of a heuristic.  We need to run combine_stack_adjustments