From patchwork Thu Sep 16 12:26:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Monakov X-Patchwork-Id: 64961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 6928C104798 for ; Thu, 16 Sep 2010 22:26:51 +1000 (EST) Received: (qmail 12600 invoked by alias); 16 Sep 2010 12:26:47 -0000 Received: (qmail 12578 invoked by uid 22791); 16 Sep 2010 12:26:44 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.ispras.ru (HELO smtp.ispras.ru) (83.149.198.201) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 16 Sep 2010 12:26:38 +0000 Received: from ispserv.ispras.ru (ispserv.ispras.ru [83.149.198.72]) by smtp.ispras.ru (Postfix) with ESMTP id D73055D40DF; Thu, 16 Sep 2010 14:40:15 +0400 (MSD) Received: from monoid.intra.ispras.ru (winnie.ispras.ru [83.149.198.236]) by ispserv.ispras.ru (Postfix) with ESMTP id AE8C33FC48; Thu, 16 Sep 2010 16:26:35 +0400 (MSD) Date: Thu, 16 Sep 2010 16:26:35 +0400 (MSD) From: Alexander Monakov To: gcc-patches@gcc.gnu.org cc: Andrey Belevantsev Subject: [committed] sel-sched: make maybe_tidy_empty_bb static again Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, Andrey pointed out that instead of exporting maybe_tidy_empty_bb from sel-sched-ir.c to unbreak bootstrap after the last selective scheduler patch, I should have used tidy_control_flow (which is equivalent when the second argument is false). Therefore, I have reverted that change and changed sel-sched.c to use tidy_control_flow under the `obvious' rule. 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. Index: gcc/sel-sched.c =================================================================== --- gcc/sel-sched.c (revision 164335) +++ gcc/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, false); + tidy_control_flow (bb, false); bb = block_next; } Index: gcc/sel-sched-ir.c =================================================================== --- gcc/sel-sched-ir.c (revision 164335) +++ gcc/sel-sched-ir.c (working copy) @@ -3540,7 +3540,7 @@ } /* 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; Index: gcc/sel-sched-ir.h =================================================================== --- gcc/sel-sched-ir.h (revision 164335) +++ gcc/sel-sched-ir.h (working copy) @@ -1619,7 +1619,6 @@ 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);