aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@cygnus.com>2000-08-20 15:16:32 -0700
committerRichard Henderson <rth@gcc.gnu.org>2000-08-20 15:16:32 -0700
commit7171b4910c1b59ba953263a0625917ba4b7e57ee (patch)
tree453e0d233ee47fc7a06be4aece7aaea6b7f4d165
parent8559f9bb2f3d3bb300d21df3ad41901dc6619121 (diff)
downloadgcc-7171b4910c1b59ba953263a0625917ba4b7e57ee.zip
gcc-7171b4910c1b59ba953263a0625917ba4b7e57ee.tar.gz
gcc-7171b4910c1b59ba953263a0625917ba4b7e57ee.tar.bz2
* flow.c (merge_blocks_nomove): Don't seek back past the bb note.
From-SVN: r35827
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/flow.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1fd965f..9d1c66e 100644
--- 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 98ed692..a1ea1a8 100644
--- 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;