diff options
Diffstat (limited to 'gcc/cfgcleanup.c')
| -rw-r--r-- | gcc/cfgcleanup.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index c2595ea..1a33784 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -623,7 +623,6 @@ static void merge_blocks_move_predecessor_nojumps (basic_block a, basic_block b) { rtx barrier; - bool only_notes; /* If we are partitioning hot/cold basic blocks, we don't want to mess up unconditional or indirect jumps that cross between hot @@ -642,16 +641,6 @@ merge_blocks_move_predecessor_nojumps (basic_block a, basic_block b) gcc_assert (BARRIER_P (barrier)); delete_insn (barrier); - /* Move block and loop notes out of the chain so that we do not - disturb their order. - - ??? A better solution would be to squeeze out all the non-nested notes - and adjust the block trees appropriately. Even better would be to have - a tighter connection between block trees and rtl so that this is not - necessary. */ - only_notes = squeeze_notes (&BB_HEAD (a), &BB_END (a)); - gcc_assert (!only_notes); - /* Scramble the insn chain. */ if (BB_END (a) != PREV_INSN (BB_HEAD (b))) reorder_insns_nobb (BB_HEAD (a), BB_END (a), PREV_INSN (BB_HEAD (b))); @@ -679,7 +668,6 @@ merge_blocks_move_successor_nojumps (basic_block a, basic_block b) { rtx barrier, real_b_end; rtx label, table; - bool only_notes; /* If we are partitioning hot/cold basic blocks, we don't want to mess up unconditional or indirect jumps that cross between hot @@ -709,16 +697,6 @@ merge_blocks_move_successor_nojumps (basic_block a, basic_block b) if (barrier && BARRIER_P (barrier)) delete_insn (barrier); - /* Move block and loop notes out of the chain so that we do not - disturb their order. - - ??? A better solution would be to squeeze out all the non-nested notes - and adjust the block trees appropriately. Even better would be to have - a tighter connection between block trees and rtl so that this is not - necessary. */ - only_notes = squeeze_notes (&BB_HEAD (b), &BB_END (b)); - gcc_assert (!only_notes); - /* Scramble the insn chain. */ reorder_insns_nobb (BB_HEAD (b), BB_END (b), BB_END (a)); @@ -2028,7 +2006,7 @@ try_optimize_cfg (int mode) delete_insn_chain (label, label); /* In the case label is undeletable, move it after the BASIC_BLOCK note. */ - if (NOTE_LINE_NUMBER (BB_HEAD (b)) == NOTE_INSN_DELETED_LABEL) + if (NOTE_KIND (BB_HEAD (b)) == NOTE_INSN_DELETED_LABEL) { rtx bb_note = NEXT_INSN (BB_HEAD (b)); |