2006-06-08 Maxim Kuvyrkov <mkuvyrkov@ispras.ru>

	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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12bd419..d840d64 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-08  Maxim Kuvyrkov  <mkuvyrkov@ispras.ru>
+
+       PR target/27863
+       * haifa-sched.c (unlink_other_notes, unlink_line_notes): Update basic
+       block boundaries.
+
 2006-06-08  Richard Guenther  <rguenther@suse.de>
 
        PR middle-end/27116

diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 9505047..8bd65c2 100644 (file)
--- 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;
        }