diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/flow.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1fd965ff843..9d1c66e4b02 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 98ed692357e..a1ea1a835c2 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; |
