Re: Change in order of compilation passes

[Steven Bosscher <s dot bosscher at student dot tudelft dot nl>]

On Monday 26 January 2004 19:16, Ian Lance Taylor wrote:
> Did you mean to check this in?  If not, could you please correct it?

Hmm no! <cursing>.

Part of that checkin restored the situation in toplev.c to what
it was before I checked in Zdenek's improved dominator patch. 
Along with that patch I somehow managed to check in garbage from
an old tree that I had used to isolate one bug in the loop
optimizer (hence the disabling of loop2).  Richard Sandiford
pointed that out to me off-list.  The broken checkin is this:

http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/toplev.c.diff?r1=1.855&r2=1.856

But somehow I messed up the checkin to fix the mess-up???
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/toplev.c.diff?r1=1.857&r2=1.858

I never intended to move rest_of_hanlde_jump_bypass.  I will
check in the attached patch.

This wasn't exactly my luckiest checkin.  Never commit a big
patch when you're in a hurry to go home for new year :-/

Sorry about this.  I always try to be careful about what I
commit to CVS, but something here went terribly wrong...

Gr.
Steven


Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 2.2497
diff -c -3 -p -r2.2497 ChangeLog
*** ChangeLog	26 Jan 2004 18:30:43 -0000	2.2497
--- ChangeLog	26 Jan 2004 19:13:47 -0000
***************
*** 1,3 ****
--- 1,7 ----
+ 2004-01-26  Steven Bosscher <s.bosscher@student.tudelft.nl>
+ 
+ 	* toplev.c: Fix broken checkin of 2003-12-30, again.
+ 
  2004-01-26  Jeff Law  <law@redhat.com>
  
  	* doc/contrib.texi: Minor cleanup for Paolo Carlini's entry.  Add
***************
*** 2567,2572 ****
--- 2571,2580 ----
  	* system.h (ASM_OUTPUT_MAIN_SOURCE_FILENAME): Poison.
  	* 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>
  
Index: toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.869
diff -c -3 -p -r1.869 toplev.c
*** toplev.c	23 Jan 2004 21:05:17 -0000	1.869
--- toplev.c	26 Jan 2004 19:13:56 -0000
*************** rest_of_compilation (tree decl)
*** 3310,3315 ****
--- 3310,3318 ----
  
        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);
*************** rest_of_compilation (tree decl)
*** 3337,3352 ****
    if (flag_tracer)
      rest_of_handle_tracer (decl, insns);
  
!   if (optimize > 0)
!     {
!       if (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);
!     }
  
    if (flag_web)
      rest_of_handle_web (decl, insns);
--- 3340,3350 ----
    if (flag_tracer)
      rest_of_handle_tracer (decl, insns);
  
!   if (optimize > 0
!       && (flag_unswitch_loops
  	  || flag_peel_loops
! 	  || flag_unroll_loops))
!     rest_of_handle_loop2 (decl, insns);
  
    if (flag_web)
      rest_of_handle_web (decl, insns);