* flow.c (merge_blocks_nomove): Don't seek back past the bb note.

From-SVN: r35827

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1fd965ff843c43c62e5226306c436257a2a20e17..9d1c66e4b0289fadfd609ed00390c629d8098b55 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-20  Richard Henderson  <rth@cygnus.com>
+
+       * flow.c (merge_blocks_nomove): Don't seek back past the bb note.
+
 2000-08-20  Zack Weinberg  <zack@wolery.cumb.org>
 
        * cppinit.c (cpp_init): Set global flag when called.

diff --git a/gcc/flow.c b/gcc/flow.c
index 98ed692357e4c40a87235843657fa41bc27d10c1..a1ea1a835c2aecb46abc33c567fb692c457fb076 100644 (file)
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2209,7 +2209,9 @@ merge_blocks_nomove (a, b)
       rtx prev;
 
       for (prev = PREV_INSN (a_end); ; prev = PREV_INSN (prev))
-       if (GET_CODE (prev) != NOTE || prev == a->head)
+       if (GET_CODE (prev) != NOTE
+           || NOTE_LINE_NUMBER (prev) == NOTE_INSN_BASIC_BLOCK
+           || prev == a->head)
          break;
 
       del_first = a_end;