* toplev.c: Fix broken checkin of 2003-12-30, again.

From-SVN: r76948

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5a2a66470da2f07803b5389f81dc588d8803e96..3927965520ec2ecdb0b9e5f4a136227b327ac2b1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-30  Steven Bosscher <s.bosscher@student.tudelft.nl>
+
+       * toplev.c: Fix broken checkin of 2003-12-30, again.
+
 2004-01-30  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * configure.ac (gcc_cv_as_dwarf2_debug_line): Enable test for
@@ -3207,6 +3211,10 @@
        * toplev.c (output_file_directive): Don't use
        ASM_OUTPUT_MAIN_SOURCE_FILENAME.
 
+2004-01-05  Steven Bosscher <s.bosscher@student.tudelft.nl>
+
+       * toplev.c: Fix broken checkin of 2003-12-30.
+
 2004-01-05  Daniel Berlin  <dberlin@dberlin.org>
 
        * ggc-zone.c: Remove everything in #ifdef USING_MALLOC_PAGE_GROUPS

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 425f94ea6af7f2230d26d62488e5a67b6e1c784c..5154b449cc6fecc3b3b3915580e32354fefdca36 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -3316,6 +3316,9 @@ rest_of_compilation (tree decl)
 
       if (flag_loop_optimize)
        rest_of_handle_loop_optimize (decl, insns);
+
+      if (flag_gcse)
+       rest_of_handle_jump_bypass (decl, insns);
     }
 
   timevar_push (TV_FLOW);
@@ -3343,16 +3346,11 @@ rest_of_compilation (tree decl)
   if (flag_tracer)
     rest_of_handle_tracer (decl, insns);
 
-  if (optimize > 0)
-    {
-      if (flag_unswitch_loops
+  if (optimize > 0
+      && (flag_unswitch_loops
          || flag_peel_loops
-         || flag_unroll_loops)
-       rest_of_handle_loop2 (decl, insns);
-
-      if (flag_gcse)
-       rest_of_handle_jump_bypass (decl, insns);
-    }
+         || flag_unroll_loops))
+    rest_of_handle_loop2 (decl, insns);
 
   if (flag_web)
     rest_of_handle_web (decl, insns);