* cfgcleanup.c (try_optimize_cfg): Fix thinko in previous patch.

From-SVN: r64103

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ac10a2b98611d6aef2611eca9eb0a07adf6b013..0dbb59141e44fca69774585e79051144c6b72652 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -44,6 +44,8 @@
 
 Mon Mar 10 15:30:36 CET 2003  Jan Hubicka  <jh@suse.cz>
 
+       * cfgcleanup.c (try_optimize_cfg): Fix thinko in previous patch.
+
        * cfgcleanup.c (merge_blocks): Return where to iterate next.
        (try_optimize_cfg): Use return value of merge_blocks
 

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 6ccc3eeca3e94ac900958b0a5625f07207d83ed0..7ed5c3d30606e080d96f9a41aafcb37a3db7b1fc 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -861,6 +861,8 @@ merge_blocks (e, b, c, mode)
       b_has_incoming_fallthru = (tmp_edge != NULL);
       b_fallthru_edge = tmp_edge;
       next = b->prev_bb;
+      if (next == c)
+       next = next->prev_bb;
 
       /* Otherwise, we're going to try to move C after B.  If C does
         not have an outgoing fallthru, then it can be moved