From 792f183828f1c38c2b580e1e6cee3e5768f60666 Mon Sep 17 00:00:00 2001 From: mkuvyrkov Date: Thu, 8 Jun 2006 08:51:13 +0000 Subject: [PATCH] 2006-06-08 Maxim Kuvyrkov PR target/27863 * haifa-sched.c (unlink_other_notes, unlink_line_notes): Update basic block boundaries. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114484 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/haifa-sched.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 12bd4194eb9..d840d64438d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-06-08 Maxim Kuvyrkov + + PR target/27863 + * haifa-sched.c (unlink_other_notes, unlink_line_notes): Update basic + block boundaries. + 2006-06-08 Richard Guenther PR middle-end/27116 diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 95050476c25..8bd65c276da 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; } -- 2.11.0