From 65592aadaf607bdcfb29ef7fbe6464043fb32d51 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Thu, 16 Sep 2010 16:26:23 +0400 Subject: [PATCH] sel-sched.c (move_cond_jump): Use tidy_control_flow instead of maybe_tidy_empty_bb. 2010-09-16 Alexander Monakov * sel-sched.c (move_cond_jump): Use tidy_control_flow instead of maybe_tidy_empty_bb. Revert: 2010-09-06 Alexander Monakov * sel-sched-ir.c (maybe_tidy_empty_bb): Export. From-SVN: r164336 --- gcc/ChangeLog | 9 +++++++++ gcc/sel-sched-ir.c | 2 +- gcc/sel-sched-ir.h | 1 - gcc/sel-sched.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1f4770cf5552..204ace3eb795 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2010-09-16 Alexander Monakov + + * sel-sched.c (move_cond_jump): Use tidy_control_flow instead of + maybe_tidy_empty_bb. + + Revert: + 2010-09-06 Alexander Monakov + * sel-sched-ir.c (maybe_tidy_empty_bb): Export. + 2010-09-16 Joseph Myers * target.def (target_option.optimization): New hook. diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 853205d66c57..a9d7ccf0fcde 100644 --- 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 e756205dd8e3..ee9061f6d729 100644 --- 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 dd06fc6cf820..041c471b94c2 100644 --- 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; } -- 2.47.3