re PR middle-end/41360 (Revision 151696 breaks gcc.c-torture/compile/builtin_unreacha...

        PR middle-end/41360
        * cfgbuild.c (find_bb_boundaries): Really re-instate 2009-09-02
        barrier fix.

From-SVN: r151771

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8d6ae7d..da86ebe 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-16  Richard Henderson  <rth@redhat.com>
 
+       PR middle-end/41360
+       * cfgbuild.c (find_bb_boundaries): Really re-instate 2009-09-02
+       barrier fix.
+
+2009-09-16  Richard Henderson  <rth@redhat.com>
+
        PR target/41246
        * tree-cfg.c (verify_gimple_call): Validate that gimple_call_chain
        is set only if DECL_NO_STATIC_CHAIN is unset.

diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 5744108..b063f89 100644 (file)
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -485,9 +485,9 @@ find_bb_boundaries (basic_block bb)
          if (!flow_transfer_insn)
            flow_transfer_insn = prev_nonnote_insn_bb (insn);
        }
-      else if (control_flow_insn_p (insn))
-       flow_transfer_insn = insn;
 
+      if (control_flow_insn_p (insn))
+       flow_transfer_insn = insn;
       if (insn == end)
        break;
       insn = NEXT_INSN (insn);