diff options
| author | Nathan Froyd <froydnj@codesourcery.com> | 2010-10-21 02:33:33 +0000 |
|---|---|---|
| committer | Nathan Froyd <froydnj@codesourcery.com> | 2010-10-21 02:33:33 +0000 |
| commit | fa42c011ac41a6f1405b7c91e762a4ee98517641 (patch) | |
| tree | 46c04a0ca71f226e6c7a15bdb22ae8bb69768800 /gcc/sel-sched-ir.c | |
| parent | 133312b926e35c321336f9479d3365a0336ed2e0 (diff) | |
* basic-block.h (find_fallthru_edge): Define.
* cfgcleanup.c (merge_blocks_move): Use it.
(try_crossjump_bb): Likewise.
* cfglayout.c (fixup_reorder_chains): Likewise.
(fixup_fallthru_exit_predecessor): Likewise.
* cfgrtl.c (rtl_split_edge): Likewise.
(rtl_verify_flow_info): Likewise.
* function.c (thread_prologue_and_epilogue_insns): Likewise.
* gimple-pretty-print.c (dump_implicit_edges): Likewise.
* ifcvt.c (block_fallthru): Likewise.
* reload1.c (fixup_abnormal_edges): Likewise.
* sched-ebb.c (being_schedule_ready): Likewise.
(schedule_ebb): Likwise.
* sched-rgn.c (find_single_block_region): Likewise.
* sel-sched-ir.c (bb_ends_ebb_p): Likewise.
* tree-complex.c (expand_complex_move): Likewise.
* sched-int.h (find_fallthru_edge): Rename to...
(find_fallthru_edge_from): ...this.
* haifa-sched.c (find_fallthru_edge): Rename to...
(find_fallthru_edge_from): ...this. Use new find_fallthru_edge.
(init_before_recovery): Call find_fallthru_edge_from.
* sel-sched-ir.c (merge_fences): Likewise.
* sel-sched.c (in_fallthru_bb_p): Likewise.
(move_cond_jump): Likewise.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@165748 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/sel-sched-ir.c')
| -rw-r--r-- | gcc/sel-sched-ir.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 452d8d43a65..141c935f6d8 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -689,7 +689,7 @@ merge_fences (fence_t f, insn_t insn, /* Find fallthrough edge. */ gcc_assert (BLOCK_FOR_INSN (insn)->prev_bb); - candidate = find_fallthru_edge (BLOCK_FOR_INSN (insn)->prev_bb); + candidate = find_fallthru_edge_from (BLOCK_FOR_INSN (insn)->prev_bb); if (!candidate || (candidate->src != BLOCK_FOR_INSN (last_scheduled_insn) @@ -4667,7 +4667,6 @@ bb_ends_ebb_p (basic_block bb) { basic_block next_bb = bb_next_bb (bb); edge e; - edge_iterator ei; if (next_bb == EXIT_BLOCK_PTR || bitmap_bit_p (forced_ebb_heads, next_bb->index) @@ -4680,13 +4679,13 @@ bb_ends_ebb_p (basic_block bb) if (!in_current_region_p (next_bb)) return true; - FOR_EACH_EDGE (e, ei, bb->succs) - if ((e->flags & EDGE_FALLTHRU) != 0) - { - gcc_assert (e->dest == next_bb); - - return false; - } + e = find_fallthru_edge (bb->succs); + if (e) + { + gcc_assert (e->dest == next_bb); + + return false; + } return true; } |