2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a72584..7c59c10 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-11  Richard Henderson  <rth@cygnus.com>
 
+	* flow.c (merge_blocks_nomove): Be more careful about
+	locating the beginning of block A.
+
 	* combine.c (simplify_shift_const): Obey SHIFT_COUNT_TRUNCATED.
 
 Thu Aug 10 22:47:09 2000  Ovidiu Predescu  <ovidiu@cup.hp.com>
diff --git a/gcc/flow.c b/gcc/flow.c
index 483592f..8a901c8 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2211,9 +2211,9 @@ merge_blocks_nomove (a, b)
     {
       rtx prev;
 
-      prev = prev_nonnote_insn (a_end);
-      if (!prev) 
-	prev = a->head;
+      for (prev = PREV_INSN (a_end); ; prev = PREV_INSN (prev))
+	if (GET_CODE (prev) != NOTE || prev == a->head)
+	  break;
 
       del_first = a_end;