flow.c (flow_analysis): Be consistent with find_basic_blocks in determining when...

	* flow.c (flow_analysis): Be consistent with find_basic_blocks in
	determining when a new basic block starts.

From-SVN: r17085

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 045c41f82b3f1c8fb2054796c29040cdb5114760..4971b8e17bdcc67c9b4bb9a64ffd349ed8653e81 100644 (file)
--- 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 720886d79d6d7cfae1231b37c2ba35403dbdbd1f..1c755281499bf08eb8d3bf9a4b8c02861e7a5749 100644 (file)
--- 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++;