aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Monakov <amonakov@ispras.ru>2010-09-16 16:26:23 +0400
committerAlexander Monakov <amonakov@gcc.gnu.org>2010-09-16 16:26:23 +0400
commit65592aadaf607bdcfb29ef7fbe6464043fb32d51 (patch)
tree633ac1749ea582e089b00eb5aa7fe7f43c85d621
parentfac0f7224d4fbb441496c8ea17c5b413b8cbe83c (diff)
downloadgcc-65592aadaf607bdcfb29ef7fbe6464043fb32d51.zip
gcc-65592aadaf607bdcfb29ef7fbe6464043fb32d51.tar.gz
gcc-65592aadaf607bdcfb29ef7fbe6464043fb32d51.tar.bz2
sel-sched.c (move_cond_jump): Use tidy_control_flow instead of maybe_tidy_empty_bb.
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. From-SVN: r164336
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/sel-sched-ir.c2
-rw-r--r--gcc/sel-sched-ir.h1
-rw-r--r--gcc/sel-sched.c2
4 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f4770c..204ace3 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 853205d..a9d7ccf 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 e756205..ee9061f 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 dd06fc6..041c471 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;
}