diff options
Diffstat (limited to 'gcc/cfgbuild.c')
| -rw-r--r-- | gcc/cfgbuild.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c index 642efc31e08..e564e8b89e3 100644 --- a/gcc/cfgbuild.c +++ b/gcc/cfgbuild.c @@ -402,7 +402,7 @@ make_edges (basic_block min, basic_block max, int update_p) while (insn && NOTE_P (insn) - && NOTE_LINE_NUMBER (insn) != NOTE_INSN_BASIC_BLOCK) + && NOTE_KIND (insn) != NOTE_INSN_BASIC_BLOCK) insn = NEXT_INSN (insn); if (!insn) @@ -469,22 +469,18 @@ find_basic_blocks_1 (rtx f) switch (code) { case NOTE: - { - int kind = NOTE_LINE_NUMBER (insn); - - /* Look for basic block notes with which to keep the - basic_block_info pointers stable. Unthread the note now; - we'll put it back at the right place in create_basic_block. - Or not at all if we've already found a note in this block. */ - if (kind == NOTE_INSN_BASIC_BLOCK) - { - if (bb_note == NULL_RTX) - bb_note = insn; - else - next = delete_insn (insn); - } - break; - } + /* Look for basic block notes with which to keep the + basic_block_info pointers stable. Unthread the note now; + we'll put it back at the right place in create_basic_block. + Or not at all if we've already found a note in this block. */ + if (NOTE_INSN_BASIC_BLOCK_P (insn)) + { + if (bb_note == NULL_RTX) + bb_note = insn; + else + next = delete_insn (insn); + } + break; case CODE_LABEL: case JUMP_INSN: |