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.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f4770c..204ace3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2010-09-16  Joseph Myers  <joseph@codesourcery.com>
 
        * target.def (target_option.optimization): New hook.

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 853205d..a9d7ccf 100644 (file)
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -3540,7 +3540,7 @@ sel_recompute_toporder (void)
 }
 
 /* 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;

diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
index e756205..ee9061f 100644 (file)
--- a/gcc/sel-sched-ir.h
+++ b/gcc/sel-sched-ir.h
@@ -1619,7 +1619,6 @@ extern bool tidy_control_flow (basic_block, bool);
 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);

diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index dd06fc6..041c471 100644 (file)
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -4941,7 +4941,7 @@ move_cond_jump (rtx insn, bnd_t bnd)
       /* 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;
     }