diff options
| author | amonakov <amonakov@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-16 12:26:23 +0000 |
|---|---|---|
| committer | amonakov <amonakov@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-16 12:26:23 +0000 |
| commit | 81d1ad0f663a8fccb18de33447cdc695c9087e83 (patch) | |
| tree | 633ac1749ea582e089b00eb5aa7fe7f43c85d621 | |
| parent | 02e53c17731ff9164c93fbdf42d7f2ba6fa5276e (diff) | |
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
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/sel-sched-ir.c | 2 | ||||
| -rw-r--r-- | gcc/sel-sched-ir.h | 1 | ||||
| -rw-r--r-- | gcc/sel-sched.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1f4770cf555..204ace3eb79 100644 --- 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 853205d66c5..a9d7ccf0fcd 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 e756205dd8e..ee9061f6d72 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 dd06fc6cf82..041c471b94c 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; } |