From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4108 invoked by alias); 11 Apr 2011 21:55:24 -0000 Received: (qmail 4099 invoked by uid 22791); 11 Apr 2011 21:55:23 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,TW_CF X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 11 Apr 2011 21:55:18 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 84657CB0289 for ; Mon, 11 Apr 2011 23:55:17 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kM6ZboC2CYMz for ; Mon, 11 Apr 2011 23:55:14 +0200 (CEST) Received: from [192.168.1.2] (bon31-9-83-155-120-49.fbx.proxad.net [83.155.120.49]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id 285BFCB02A6 for ; Mon, 11 Apr 2011 23:55:14 +0200 (CEST) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: Avoid doing superfluous work in force_nonfallthru Date: Mon, 11 Apr 2011 21:55:00 -0000 User-Agent: KMail/1.9.9 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_Ge3oN0UzXBO2JgB" Message-Id: <201104112349.58111.ebotcazou@adacore.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-04/txt/msg00817.txt.bz2 --Boundary-00=_Ge3oN0UzXBO2JgB Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 511 The new force_nonfallthru was modelled on redirect_edge_and_branch_force, but this means that it is doing superfluous work when the edge can be turned into a non-fallthru edge without creating a new basic block. Fixed thusly, bootstrapped/regested on x86_64-suse-linux, applied. 2011-04-11 Eric Botcazou * cfghooks.c (redirect_edge_and_branch_force): Localize variable. (force_nonfallthru): Do not alter the loop nest if no basic block was created. -- Eric Botcazou --Boundary-00=_Ge3oN0UzXBO2JgB Content-Type: text/x-diff; charset="iso 8859-15"; name="p.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="p.diff" Content-length: 2296 Index: cfghooks.c =================================================================== --- cfghooks.c (revision 172247) +++ cfghooks.c (working copy) @@ -388,7 +388,6 @@ basic_block redirect_edge_and_branch_force (edge e, basic_block dest) { basic_block ret, src = e->src; - struct loop *loop; if (!cfg_hooks->redirect_edge_and_branch_force) internal_error ("%s does not support redirect_edge_and_branch_force", @@ -398,6 +397,7 @@ redirect_edge_and_branch_force (edge e, rescan_loop_exit (e, false, true); ret = cfg_hooks->redirect_edge_and_branch_force (e, dest); + if (ret != NULL && dom_info_available_p (CDI_DOMINATORS)) set_immediate_dominator (CDI_DOMINATORS, ret, src); @@ -405,8 +405,9 @@ redirect_edge_and_branch_force (edge e, { if (ret != NULL) { - loop = find_common_loop (single_pred (ret)->loop_father, - single_succ (ret)->loop_father); + struct loop *loop + = find_common_loop (single_pred (ret)->loop_father, + single_succ (ret)->loop_father); add_bb_to_loop (ret, loop); } else if (find_edge (src, dest) == e) @@ -882,30 +883,26 @@ tidy_fallthru_edges (void) basic_block force_nonfallthru (edge e) { - basic_block ret, src = e->src, dest = e->dest; - struct loop *loop; + basic_block ret, src = e->src; if (!cfg_hooks->force_nonfallthru) internal_error ("%s does not support force_nonfallthru", cfg_hooks->name); - if (current_loops != NULL) - rescan_loop_exit (e, false, true); - ret = cfg_hooks->force_nonfallthru (e); - if (ret != NULL && dom_info_available_p (CDI_DOMINATORS)) - set_immediate_dominator (CDI_DOMINATORS, ret, src); - - if (current_loops != NULL) + if (ret != NULL) { - if (ret != NULL) + if (dom_info_available_p (CDI_DOMINATORS)) + set_immediate_dominator (CDI_DOMINATORS, ret, src); + + if (current_loops != NULL) { - loop = find_common_loop (single_pred (ret)->loop_father, - single_succ (ret)->loop_father); + struct loop *loop + = find_common_loop (single_pred (ret)->loop_father, + single_succ (ret)->loop_father); + rescan_loop_exit (e, false, true); add_bb_to_loop (ret, loop); } - else if (find_edge (src, dest) == e) - rescan_loop_exit (e, true, false); } return ret; --Boundary-00=_Ge3oN0UzXBO2JgB--