diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 045c41f82b3..4971b8e17bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Fri Dec 12 01:19:48 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* flow.c (flow_analysis): Be consistent with find_basic_blocks in
+	determining when a new basic block starts.
+
 	* alpha/osf2or3.h (LIB_SPEC): Restore missing defn.
 
 	* pa.h (TEXT_SPACE_P): Use TREE_CODE_CLASS.
diff --git a/gcc/flow.c b/gcc/flow.c
index 720886d79d6..1c755281499 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -317,7 +317,8 @@ flow_analysis (f, nregs, file)
 	    || (GET_RTX_CLASS (code) == 'i'
 		&& (prev_code == JUMP_INSN
 		    || (prev_code == CALL_INSN
-			&& (nonlocal_label_list != 0 || eh_region))
+			&& (nonlocal_label_list != 0 || eh_region)
+			&& ! find_reg_note (insn, REG_RETVAL, NULL_RTX))
 		    || prev_code == BARRIER)))
 	  i++;