From: Alexander Monakov <amonakov@ispras.ru>
Date: Mon, 6 Sep 2010 10:31:26 +0000 (+0400)
Subject: sel-sched.c (move_cond_jump): Correct arguments to maybe_tidy_empty_bb.
X-Git-Tag: releases/gcc-4.6.0~4620
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5cb031ff9f42f007f461cd7bbe6b77c643b584c;p=thirdparty%2Fgcc.git

sel-sched.c (move_cond_jump): Correct arguments to maybe_tidy_empty_bb.

        * sel-sched.c (move_cond_jump): Correct arguments to maybe_tidy_empty_bb.
        * sel-sched-ir.c (maybe_tidy_empty_bb): Export.

From-SVN: r163908
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d882b6290a1e..dd25fccffc15 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-06  Alexander Monakov  <amonakov@ispras.ru>
+
+	* sel-sched.c (move_cond_jump): Correct arguments to maybe_tidy_empty_bb.
+	* sel-sched-ir.c (maybe_tidy_empty_bb): Export.
+
 2010-09-06  Andrey Belevantsev  <abel@ispras.ru>
 
 	PR rtl-optimization/44919
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index a9d7ccf0fcde..853205d66c57 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.  */
-static bool
+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 ee9061f6d729..e756205dd8e3 100644
--- a/gcc/sel-sched-ir.h
+++ b/gcc/sel-sched-ir.h
@@ -1619,6 +1619,7 @@ 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 b3b1a8022686..dd06fc6cf820 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);
+	maybe_tidy_empty_bb (bb, false);
       bb = block_next;
     }