diff options
Diffstat (limited to 'gcc/cfglayout.c')
| -rw-r--r-- | gcc/cfglayout.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c index 3fb23992acf..457305c1087 100644 --- a/gcc/cfglayout.c +++ b/gcc/cfglayout.c @@ -119,7 +119,7 @@ skip_insns_after_block (basic_block bb) case CODE_LABEL: if (NEXT_INSN (insn) - && GET_CODE (NEXT_INSN (insn)) == JUMP_INSN + && JUMP_P (NEXT_INSN (insn)) && (GET_CODE (PATTERN (NEXT_INSN (insn))) == ADDR_VEC || GET_CODE (PATTERN (NEXT_INSN (insn))) == ADDR_DIFF_VEC)) { @@ -149,7 +149,7 @@ skip_insns_after_block (basic_block bb) for (insn = last_insn; insn != BB_END (bb); insn = prev) { prev = PREV_INSN (insn); - if (GET_CODE (insn) == NOTE) + if (NOTE_P (insn)) switch (NOTE_LINE_NUMBER (insn)) { case NOTE_INSN_LOOP_END: @@ -172,7 +172,7 @@ label_for_bb (basic_block bb) { rtx label = BB_HEAD (bb); - if (GET_CODE (label) != CODE_LABEL) + if (!LABEL_P (label)) { if (dump_file) fprintf (dump_file, "Emitting label for block %d\n", bb->index); @@ -195,7 +195,7 @@ record_effective_endpoints (void) for (insn = get_insns (); insn - && GET_CODE (insn) == NOTE + && NOTE_P (insn) && NOTE_LINE_NUMBER (insn) != NOTE_INSN_BASIC_BLOCK; insn = NEXT_INSN (insn)) continue; @@ -303,7 +303,7 @@ insn_locators_initialize (void) epilogue_locator = loc; if (active_insn_p (insn)) INSN_LOCATOR (insn) = loc; - else if (GET_CODE (insn) == NOTE) + else if (NOTE_P (insn)) { switch (NOTE_LINE_NUMBER (insn)) { @@ -649,7 +649,7 @@ fixup_reorder_chain (void) e_taken = e; bb_end_insn = BB_END (bb); - if (GET_CODE (bb_end_insn) == JUMP_INSN) + if (JUMP_P (bb_end_insn)) { if (any_condjump_p (bb_end_insn)) { @@ -806,7 +806,7 @@ fixup_reorder_chain (void) note); NOTE_BASIC_BLOCK (new_note) = bb; } - if (GET_CODE (BB_END (bb)) == JUMP_INSN + if (JUMP_P (BB_END (bb)) && !any_condjump_p (BB_END (bb)) && bb->succ->crossing_edge ) REG_NOTES (BB_END (bb)) = gen_rtx_EXPR_LIST @@ -829,7 +829,7 @@ fixup_reorder_chain (void) fprintf (dump_file, "duplicate of %i ", bb->rbi->original->index); else if (forwarder_block_p (bb) - && GET_CODE (BB_HEAD (bb)) != CODE_LABEL) + && !LABEL_P (BB_HEAD (bb))) fprintf (dump_file, "compensation "); else fprintf (dump_file, "bb %i ", bb->index); @@ -875,7 +875,7 @@ update_unlikely_executed_notes (basic_block bb) for (cur_insn = BB_HEAD (bb); cur_insn != BB_END (bb); cur_insn = NEXT_INSN (cur_insn)) - if (GET_CODE (cur_insn) == NOTE + if (NOTE_P (cur_insn) && NOTE_LINE_NUMBER (cur_insn) == NOTE_INSN_UNLIKELY_EXECUTED_CODE) NOTE_BASIC_BLOCK (cur_insn) = bb; } |