From f70b22c9423c0352d34ed783b92eb98645cb18f1 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 8 Jun 2006 08:51:13 +0000 Subject: re PR target/27863 (ICE in check_cfg, at haifa-sched.c:4615) 2006-06-08 Maxim Kuvyrkov PR target/27863 * haifa-sched.c (unlink_other_notes, unlink_line_notes): Update basic block boundaries. From-SVN: r114484 --- gcc/haifa-sched.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gcc/haifa-sched.c') diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 9505047..8bd65c2 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -1243,12 +1243,22 @@ unlink_other_notes (rtx insn, rtx tail) while (insn != tail && NOTE_NOT_BB_P (insn)) { rtx next = NEXT_INSN (insn); + basic_block bb = BLOCK_FOR_INSN (insn); + /* Delete the note from its current position. */ if (prev) NEXT_INSN (prev) = next; if (next) PREV_INSN (next) = prev; + /* Basic block can begin with either LABEL or + NOTE_INSN_BASIC_BLOCK. */ + gcc_assert (BB_HEAD (bb) != insn); + + /* Check if we are removing last insn in the BB. */ + if (BB_END (bb) == insn) + BB_END (bb) = prev; + /* See sched_analyze to see how these are handled. */ if (NOTE_LINE_NUMBER (insn) != NOTE_INSN_EH_REGION_BEG && NOTE_LINE_NUMBER (insn) != NOTE_INSN_EH_REGION_END) @@ -1279,12 +1289,22 @@ unlink_line_notes (rtx insn, rtx tail) if (write_symbols != NO_DEBUG && NOTE_LINE_NUMBER (insn) > 0) { + basic_block bb = BLOCK_FOR_INSN (insn); + /* Delete the note from its current position. */ if (prev) NEXT_INSN (prev) = next; if (next) PREV_INSN (next) = prev; + /* Basic block can begin with either LABEL or + NOTE_INSN_BASIC_BLOCK. */ + gcc_assert (BB_HEAD (bb) != insn); + + /* Check if we are removing last insn in the BB. */ + if (BB_END (bb) == insn) + BB_END (bb) = prev; + /* Record line-number notes so they can be reused. */ LINE_NOTE (insn) = insn; } -- cgit v1.1