FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR rtl-optimization/46204 (g++.dg/torture/stackalign/throw-1.C fails to compile on IA64)

Browse source 
PR rtl-optimization/46204
	* sel-sched-ir.c (maybe_tidy_empty_bb): Remove second argument.
	Update all callers.  Do not recompute topological order.  Adjust
	fallthrough edges following a degenerate conditional jump.

From-SVN: r166697
This commit is contained in:
Alexander Monakov 2010-11-13 12:28:52 +03:00 • committed by Alexander Monakov
parent 759fe2404d
commit 5f33b97225
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ChangeLog
View file

@ -1,3 +1,10 @@
2010-11-12 Alexander Monakov <amonakov@ispras.ru>
PR rtl-optimization/46204
* sel-sched-ir.c (maybe_tidy_empty_bb): Remove second argument.
Update all callers. Do not recompute topological order. Adjust
fallthrough edges following a degenerate conditional jump.
2010-11-12 Joseph Myers <joseph@codesourcery.com>
* opts-common.c (control_warning_option): New.

34
gcc/sel-sched-ir.c
View file

@ -3562,7 +3562,7 @@ sel_recompute_toporder (void)
/* Tidy the possibly empty block BB. */
static bool
maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
maybe_tidy_empty_bb (basic_block bb)
{
basic_block succ_bb, pred_bb;
edge e;
@ -3612,10 +3612,29 @@ maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
if (!(e->flags & EDGE_FALLTHRU))
{
recompute_toporder_p |= sel_redirect_edge_and_branch (e, succ_bb);
/* We can not invalidate computed topological order by moving
the edge destination block (E->SUCC) along a fallthru edge. */
sel_redirect_edge_and_branch (e, succ_bb);
rescan_p = true;
break;
}
/* If the edge is fallthru, but PRED_BB ends in a conditional jump
to BB (so there is no non-fallthru edge from PRED_BB to BB), we
still have to adjust it. */
else if (single_succ_p (pred_bb) && any_condjump_p (BB_END (pred_bb)))
{
/* If possible, try to remove the unneeded conditional jump. */
if (INSN_SCHED_TIMES (BB_END (pred_bb)) == 0
&& !IN_CURRENT_FENCE_P (BB_END (pred_bb)))
{
if (!sel_remove_insn (BB_END (pred_bb), false, false))
tidy_fallthru_edge (e);
}
else
sel_redirect_edge_and_branch (e, succ_bb);
rescan_p = true;
break;
}
}
}
@ -3631,9 +3650,6 @@ maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
remove_empty_bb (bb, true);
}
if (recompute_toporder_p)
sel_recompute_toporder ();
#ifdef ENABLE_CHECKING
verify_backedges ();
#endif
@ -3651,7 +3667,7 @@ tidy_control_flow (basic_block xbb, bool full_tidying)
insn_t first, last;
/* First check whether XBB is empty. */
changed = maybe_tidy_empty_bb (xbb, false);
changed = maybe_tidy_empty_bb (xbb);
if (changed || !full_tidying)
return changed;
@ -3715,8 +3731,8 @@ tidy_control_flow (basic_block xbb, bool full_tidying)
that contained that jump, becomes empty too. In such case
remove it too. */
if (sel_bb_empty_p (xbb->prev_bb))
changed = maybe_tidy_empty_bb (xbb->prev_bb, recompute_toporder_p);
else if (recompute_toporder_p)
changed = maybe_tidy_empty_bb (xbb->prev_bb);
if (recompute_toporder_p)
sel_recompute_toporder ();
}
return changed;
@ -3733,7 +3749,7 @@ purge_empty_blocks (void)
{
basic_block b = BASIC_BLOCK (BB_TO_BLOCK (i));
if (maybe_tidy_empty_bb (b, false))
if (maybe_tidy_empty_bb (b))
continue;
i++;