From bd454efdcf81282b006932fa7bcf8e8bc9968052 Mon Sep 17 00:00:00 2001 From: Steven Bosscher Date: Thu, 19 Aug 2004 00:32:41 +0000 Subject: basic-block.h (struct edge_def): Remove crossing_edge. * basic-block.h (struct edge_def): Remove crossing_edge. (EDGE_CROSSING): New define. (EDGE_ALL_FLAGS): Update. * bb-reorder.c (find_traces_1_round, better_edge_p, find_rarely_executed_basic_blocks_and_cr, fix_up_fall_thru_edges, find_jump_block, fix_crossing_conditional_branches, fix_crossing_unconditional_branches, add_reg_crossing_jump_notes): Replace all occurences of crossing_edge with an edge flag check or set/reset. * cfgcleanup.c (try_simplify_condjump, try_forward_edges, try_crossjump_bb): Likewise. * cfglayout.c (fixup_reorder_chain): Likewise. * cfgrtl.c (force_nonfallthru_and_redirect, commit_one_edge_insertion): Likewise. * Makefile.in (cfganal.o): Depend on TIMEVAR_H. * tree-flow.h (compute_dominance_frontiers): Move prototype... * basic-block.h: ...here. * tree-cfg.c (compute_dominance_frontiers_1, compute_dominance_frontiers): Move from here... * cfganal.c: ...to here. Include timevar.h. From-SVN: r86228 --- gcc/cfgrtl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gcc/cfgrtl.c') diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index f3618f0..7295ead 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -1114,7 +1114,7 @@ force_nonfallthru_and_redirect (edge e, basic_block target) } if (JUMP_P (BB_END (jump_block)) && !any_condjump_p (BB_END (jump_block)) - && jump_block->succ->crossing_edge ) + && (jump_block->succ->flags & EDGE_CROSSING)) REG_NOTES (BB_END (jump_block)) = gen_rtx_EXPR_LIST (REG_CROSSING_JUMP, NULL_RTX, REG_NOTES (BB_END (jump_block))); @@ -1602,7 +1602,7 @@ commit_one_edge_insertion (edge e, int watch_calls) && targetm.have_named_sections && e->src != ENTRY_BLOCK_PTR && e->src->partition == COLD_PARTITION - && !e->crossing_edge) + && !(e->flags & EDGE_CROSSING)) { rtx bb_note, new_note, cur_insn; @@ -1621,7 +1621,7 @@ commit_one_edge_insertion (edge e, int watch_calls) NOTE_BASIC_BLOCK (new_note) = bb; if (JUMP_P (BB_END (bb)) && !any_condjump_p (BB_END (bb)) - && bb->succ->crossing_edge ) + && (bb->succ->flags & EDGE_CROSSING)) REG_NOTES (BB_END (bb)) = gen_rtx_EXPR_LIST (REG_CROSSING_JUMP, NULL_RTX, REG_NOTES (BB_END (bb))); if (after == bb_note) @@ -1986,7 +1986,7 @@ rtl_verify_flow_info_1 (void) if (e->flags & EDGE_FALLTHRU) { n_fallthru++, fallthru = e; - if (e->crossing_edge + if ((e->flags & EDGE_CROSSING) || (e->src->partition != e->dest->partition && e->src != ENTRY_BLOCK_PTR && e->dest != EXIT_BLOCK_PTR)) -- cgit v1.1