* cfgcleanup.c (try_simplify_condjump): Fix my previous patch.

From-SVN: r71153

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f265b796290ec7ab65f6b8eb0d38d58313dd82c..a9183b428d02cddd14cd262d7eaf1d978d2ade81 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 Sun Sep  7 00:22:22 CEST 2003  Jan Hubicka  <jh@suse.cz>
 
+       * cfgcleanup.c (try_simplify_condjump): Fix my previous patch.
+
        * toplev.c  (rest_of_decl_compilation):  Do not finalize external
        virables. 
 

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index fc5be846dee96acf5f3bb2828bdf426e780809c8..9bf2b684f2d644f60d5211f1606384f03bf9727b 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -182,7 +182,13 @@ try_simplify_condjump (basic_block cbranch_block)
       next = NEXT_INSN (insn);
       if (GET_CODE (insn) == NOTE && NOTE_LINE_NUMBER (insn) > 0)
        {
-         reorder_insns (insn, insn, end);
+         if (insn == end)
+           {
+             jump_block->end = PREV_INSN (insn);
+             if (jump_block->end == end)
+               break;
+           }
+         reorder_insns_nobb (insn, insn, end);
          end = insn;
        }
     }