From patchwork Mon Sep  6 10:36:28 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Fix PR 44919
Date: Mon, 06 Sep 2010 00:36:28 -0000
From: Alexander Monakov <amonakov@ispras.ru>
X-Patchwork-Id: 63913
Message-Id: <alpine.LNX.2.00.1009061432470.25502@monoid.intra.ispras.ru>
To: Paolo Carlini <paolo.carlini@oracle.com>
Cc: Andrey Belevantsev <abel@ispras.ru>, GCC Patches <gcc-patches@gcc.gnu.org>,
 "Vladimir N. Makarov" <vmakarov@redhat.com>

On Mon, 6 Sep 2010, Paolo Carlini wrote:

> ... as far as I can see, this patch is breaking the build:

Yes, I checked in a 4.4 patch into trunk by mistake.  I have committed the
following patch to fix the build error.

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.


Index: sel-sched.c
===================================================================
--- sel-sched.c	(revision 163904)
+++ sel-sched.c	(working copy)
@@ -4941,7 +4941,7 @@
       /* 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;
     }
 
Index: sel-sched-ir.c
===================================================================
--- sel-sched-ir.c	(revision 163903)
+++ sel-sched-ir.c	(working copy)
@@ -3540,7 +3540,7 @@
 }
 
 /* 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;
Index: sel-sched-ir.h
===================================================================
--- sel-sched-ir.h	(revision 163903)
+++ sel-sched-ir.h	(working copy)
@@ -1619,6 +1619,7 @@
 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);