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

From-SVN: r35827

* flow.c (merge_blocks_nomove): Don't seek back past the bb note.
From-SVN: r35827
7171b491 · Richard Henderson · Richard Henderson · 8559f9bb · 7171b491 · 7171b491
Commit 7171b491 authored Aug 20, 2000 by Richard Henderson Committed by Richard Henderson Aug 20, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletions

gcc/ChangeLog
+4 -0

gcc/flow.c
+3 -1

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+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.

--- 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;