[dataflow] unbreak ia64 (committed)

Paolo Bonzini paolo.bonzini@lu.unisi.ch
Thu Mar 29 13:04:00 GMT 2007


Kenny's latest patch broke ia64.  This fixes it and
corrects the nit I pointed out yesterday.

Paolo

2007-03-29  Paolo Bonzini <bonzini@gnu.org>

        * df-core.c (pass_df_finish): Restore.
        (pass_df_finish_opt, pass_df_finish_no_opt): Remove.
        * tree-pass.h (pass_df_finish): Restore.
        (pass_df_finish_opt, pass_df_finish_no_opt): Remove.
        * passes.c (init_optimizations_passes): Remove pass_df_finish_no_opt.
        Rename pass_df_finish_opt to pass_df_finish.
        * reg-stack.c: Mostly evert previous commit.

Index: reg-stack.c
===================================================================
--- reg-stack.c (revision 123324)
+++ reg-stack.c (working copy)
@@ -3212,19 +3212,11 @@ gate_handle_stack_regs (void)
 #endif
 }
 
-/* Just run the sub passes which do all of the work.  */
-static unsigned int
-rest_of_handle_stack_regs (void)
-{
-  return 0;
-}
-
-
 struct tree_opt_pass pass_stack_regs =
 {
   "stack",                              /* name */
   gate_handle_stack_regs,               /* gate */
-  rest_of_handle_stack_regs,            /* execute */
+  NULL,                                        /* execute */
   NULL,                                 /* sub */
   NULL,                                 /* next */
   0,                                    /* static_pass_number */
@@ -3240,7 +3232,7 @@ struct tree_opt_pass pass_stack_regs =
 /* Convert register usage from flat register file usage to a stack
    register file.  */
 static unsigned int
-rest_of_handle_stack_regs_run (void)
+rest_of_handle_stack_regs (void)
 {
 #ifdef STACK_REGS
   reg_to_stack ();
@@ -3253,7 +3245,7 @@ struct tree_opt_pass pass_stack_regs_run
 {
   "stack",                              /* name */
   NULL,                                 /* gate */
-  rest_of_handle_stack_regs_run,        /* execute */
+  rest_of_handle_stack_regs,            /* execute */
   NULL,                                 /* sub */
   NULL,                                 /* next */
   0,                                    /* static_pass_number */
Index: df-core.c
===================================================================
--- df-core.c   (revision 123324)
+++ df-core.c   (working copy)
@@ -783,28 +783,10 @@ rest_of_handle_df_finish (void)
 }
 
 
-struct tree_opt_pass pass_df_finish_opt =
+struct tree_opt_pass pass_df_finish =
 {
   "dfinish",                            /* name */
-  gate_opt,                             /* gate */
-  rest_of_handle_df_finish,             /* execute */
-  NULL,                                 /* sub */
-  NULL,                                 /* next */
-  0,                                    /* static_pass_number */
-  0,                                    /* tv_id */
-  0,                                    /* properties_required */
-  0,                                    /* properties_provided */
-  0,                                    /* properties_destroyed */
-  0,                                    /* todo_flags_start */
-  0,                                    /* todo_flags_finish */
-  'z'                                   /* letter */
-};
-
-
-struct tree_opt_pass pass_df_finish_no_opt =
-{
-  "dfinish",                            /* name */
-  gate_no_opt,                          /* gate */
+  NULL,                                        /* gate */
   rest_of_handle_df_finish,             /* execute */
   NULL,                                 /* sub */
   NULL,                                 /* next */
Index: passes.c
===================================================================
--- passes.c    (revision 123324)
+++ passes.c    (working copy)
@@ -764,7 +764,6 @@ init_optimization_passes (void)
              NEXT_PASS (pass_split_before_regstack);
              NEXT_PASS (pass_stack_regs_run);
            }
-         NEXT_PASS (pass_df_finish_no_opt);
          NEXT_PASS (pass_compute_alignments);
          NEXT_PASS (pass_duplicate_computed_gotos);
          NEXT_PASS (pass_variable_tracking);
@@ -772,7 +771,7 @@ init_optimization_passes (void)
          NEXT_PASS (pass_machine_reorg);
          NEXT_PASS (pass_cleanup_barriers);
          NEXT_PASS (pass_delay_slots);
-         NEXT_PASS (pass_df_finish_opt);
+         NEXT_PASS (pass_df_finish);
          NEXT_PASS (pass_split_for_shorten_branches);
          NEXT_PASS (pass_convert_to_eh_region_ranges);
          NEXT_PASS (pass_shorten_branches);



More information about the Gcc-patches mailing list