Patchwork [committed] sel-sched: make maybe_tidy_empty_bb static again

login
register
mail settings
Submitter Alexander Monakov
Date Sept. 16, 2010, 12:26 p.m.
Message ID <alpine.LNX.2.00.1009161615490.25502@monoid.intra.ispras.ru>
Download mbox | patch
Permalink /patch/64961/
State New
Headers show

Comments

Alexander Monakov - Sept. 16, 2010, 12:26 p.m.
Hi,

Andrey pointed out that instead of exporting maybe_tidy_empty_bb from
sel-sched-ir.c to unbreak bootstrap after the last selective scheduler patch,
I should have used tidy_control_flow (which is equivalent when the second
argument is false).  Therefore, I have reverted that change and changed
sel-sched.c to use tidy_control_flow under the `obvious' rule.

2010-09-16  Alexander Monakov  <amonakov@ispras.ru>

	* sel-sched.c (move_cond_jump): Use tidy_control_flow instead of
	maybe_tidy_empty_bb.

	Revert:
	2010-09-06  Alexander Monakov  <amonakov@ispras.ru>
	* sel-sched-ir.c (maybe_tidy_empty_bb): Export.

Patch

Index: gcc/sel-sched.c
===================================================================
--- gcc/sel-sched.c	(revision 164335)
+++ gcc/sel-sched.c	(working copy)
@@ -4941,7 +4941,7 @@ 
       /* Cleanup possibly empty blocks left.  */
       block_next = bb->next_bb;
       if (bb != block_from)
-	maybe_tidy_empty_bb (bb, false);
+	tidy_control_flow (bb, false);
       bb = block_next;
     }
 
Index: gcc/sel-sched-ir.c
===================================================================
--- gcc/sel-sched-ir.c	(revision 164335)
+++ gcc/sel-sched-ir.c	(working copy)
@@ -3540,7 +3540,7 @@ 
 }
 
 /* Tidy the possibly empty block BB.  */
-bool
+static bool
 maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
 {
   basic_block succ_bb, pred_bb;
Index: gcc/sel-sched-ir.h
===================================================================
--- gcc/sel-sched-ir.h	(revision 164335)
+++ gcc/sel-sched-ir.h	(working copy)
@@ -1619,7 +1619,6 @@ 
 extern void free_bb_note_pool (void);
 
 extern void sel_remove_empty_bb (basic_block, bool, bool);
-extern bool maybe_tidy_empty_bb (basic_block, bool);
 extern void purge_empty_blocks (void);
 extern basic_block sel_split_edge (edge);
 extern basic_block sel_create_recovery_block (insn_t);