* cgraphbuild.c (record_reference): Drop non-unit-at-a-time code.

[pf3gnuchains/gcc-fork.git] / gcc / passes.c

diff --git a/gcc/passes.c b/gcc/passes.c
index d700ae9..53d2985 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -1,13 +1,13 @@
 /* Top level of GCC compilers (cc1, cc1plus, etc.)
    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 /* Top level of GCC compilers (cc1, cc1plus, etc.)
    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,

-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

    Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -16,9 +16,8 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 /* This is the top level of cc1/c++.
    It parses command args, opens files, invokes the various passes
 
 /* This is the top level of cc1/c++.
    It parses command args, opens files, invokes the various passes


@@ -83,6 +82,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "tree-flow.h"
 #include "tree-pass.h"
 #include "tree-dump.h"
 #include "tree-flow.h"
 #include "tree-pass.h"
 #include "tree-dump.h"

+#include "df.h"
+#include "predict.h"

 
 #if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO)
 #include "dwarf2out.h"
 
 #if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO)
 #include "dwarf2out.h"


@@ -101,9 +102,37 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
                                   declarations for e.g. AIX 4.x.  */
 #endif
 
                                   declarations for e.g. AIX 4.x.  */
 #endif
 

+/* This is used for debugging.  It allows the current pass to printed
+   from anywhere in compilation.  */
+struct opt_pass *current_pass;
+
+/* Call from anywhere to find out what pass this is.  Useful for
+   printing out debugging information deep inside an service
+   routine.  */
+void
+print_current_pass (FILE *file)
+{
+  if (current_pass)
+    fprintf (file, "current pass = %s (%d)\n", 
+            current_pass->name, current_pass->static_pass_number);
+  else
+    fprintf (file, "no current pass.\n");
+}
+
+
+/* Call from the debugger to get the current pass name.  */
+void
+debug_pass (void)
+{
+  print_current_pass (stderr);
+} 
+
+
+

 /* Global variables used to communicate with passes.  */
 int dump_flags;
 bool in_gimple_form;
 /* Global variables used to communicate with passes.  */
 int dump_flags;
 bool in_gimple_form;

+bool first_pass_instance;

 
 
 /* This is called from various places for FUNCTION_DECL, VAR_DECL,
 
 
 /* This is called from various places for FUNCTION_DECL, VAR_DECL,


@@ -151,7 +180,7 @@ rest_of_decl_compilation (tree decl,
       /* Don't output anything when a tentative file-scope definition
         is seen.  But at end of compilation, do output code for them.
 
       /* Don't output anything when a tentative file-scope definition
         is seen.  But at end of compilation, do output code for them.
 

-        We do output all variables when unit-at-a-time is active and rely on
+        We do output all variables and rely on

         callgraph code to defer them except for forward declarations
         (see gcc.c-torture/compile/920624-1.c) */
       if ((at_end
         callgraph code to defer them except for forward declarations
         (see gcc.c-torture/compile/920624-1.c) */
       if ((at_end


@@ -217,19 +246,19 @@ finish_optimization_passes (void)
   timevar_push (TV_DUMP);
   if (profile_arc_flag || flag_test_coverage || flag_branch_probabilities)
     {
   timevar_push (TV_DUMP);
   if (profile_arc_flag || flag_test_coverage || flag_branch_probabilities)
     {

-      dump_file = dump_begin (pass_profile.static_pass_number, NULL);
+      dump_file = dump_begin (pass_profile.pass.static_pass_number, NULL);

       end_branch_prob ();
       if (dump_file)
       end_branch_prob ();
       if (dump_file)

-       dump_end (pass_profile.static_pass_number, dump_file);
+       dump_end (pass_profile.pass.static_pass_number, dump_file);

     }
 
   if (optimize > 0)
     {
     }
 
   if (optimize > 0)
     {

-      dump_file = dump_begin (pass_combine.static_pass_number, NULL);
+      dump_file = dump_begin (pass_combine.pass.static_pass_number, NULL);

       if (dump_file)
        {
          dump_combine_total_stats (dump_file);
       if (dump_file)
        {
          dump_combine_total_stats (dump_file);

-          dump_end (pass_combine.static_pass_number, dump_file);
+          dump_end (pass_combine.pass.static_pass_number, dump_file);

        }
     }
 
        }
     }
 


@@ -255,8 +284,10 @@ gate_rest_of_compilation (void)
   return !(rtl_dump_and_exit || flag_syntax_only || errorcount || sorrycount);
 }
 
   return !(rtl_dump_and_exit || flag_syntax_only || errorcount || sorrycount);
 }
 

-struct tree_opt_pass pass_rest_of_compilation =
+struct gimple_opt_pass pass_rest_of_compilation =

 {
 {

+ {
+  GIMPLE_PASS,

   NULL,                                 /* name */
   gate_rest_of_compilation,             /* gate */
   NULL,                                 /* execute */
   NULL,                                 /* name */
   gate_rest_of_compilation,             /* gate */
   NULL,                                 /* execute */


@@ -268,8 +299,8 @@ struct tree_opt_pass pass_rest_of_compilation =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */

-  TODO_ggc_collect,                     /* todo_flags_finish */
-  0                                     /* letter */
+  TODO_ggc_collect                      /* todo_flags_finish */
+ }

 };
 
 static bool
 };
 
 static bool


@@ -278,8 +309,10 @@ gate_postreload (void)
   return reload_completed;
 }
 
   return reload_completed;
 }
 

-struct tree_opt_pass pass_postreload =
+struct rtl_opt_pass pass_postreload =

 {
 {

+ {
+  RTL_PASS,

   NULL,                                 /* name */
   gate_postreload,                      /* gate */
   NULL,                                 /* execute */
   NULL,                                 /* name */
   gate_postreload,                      /* gate */
   NULL,                                 /* execute */


@@ -291,26 +324,57 @@ struct tree_opt_pass pass_postreload =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */

-  TODO_ggc_collect,                     /* todo_flags_finish */
-  0                                    /* letter */
+  TODO_ggc_collect | TODO_verify_rtl_sharing /* todo_flags_finish */
+ }

 };
 
 
 
 /* The root of the compilation pass tree, once constructed.  */
 };
 
 
 
 /* The root of the compilation pass tree, once constructed.  */

-struct tree_opt_pass *all_passes, *all_ipa_passes, *all_lowering_passes;
+struct opt_pass *all_passes, *all_ipa_passes, *all_lowering_passes;
+
+/* A map from static pass id to optimization pass.  */
+struct opt_pass **passes_by_id;
+int passes_by_id_size;
+
+/* Set the static pass number of pass PASS to ID and record that
+   in the mapping from static pass number to pass.  */
+
+static void
+set_pass_for_id (int id, struct opt_pass *pass)
+{
+  pass->static_pass_number = id;
+  if (passes_by_id_size <= id)
+    {
+      passes_by_id = XRESIZEVEC (struct opt_pass *, passes_by_id, id + 1);
+      memset (passes_by_id + passes_by_id_size, 0,
+             (id + 1 - passes_by_id_size) * sizeof (void *));
+      passes_by_id_size = id + 1;
+    }
+  passes_by_id[id] = pass;
+}
+
+/* Return the pass with the static pass number ID.  */
+
+struct opt_pass *
+get_pass_for_id (int id)
+{
+  if (id >= passes_by_id_size)
+    return NULL;
+  return passes_by_id[id];
+}

 
 /* Iterate over the pass tree allocating dump file numbers.  We want
    to do this depth first, and independent of whether the pass is
    enabled or not.  */
 
 static void
 
 /* Iterate over the pass tree allocating dump file numbers.  We want
    to do this depth first, and independent of whether the pass is
    enabled or not.  */
 
 static void

-register_one_dump_file (struct tree_opt_pass *pass, bool ipa, int properties)
+register_one_dump_file (struct opt_pass *pass)

 {
   char *dot_name, *flag_name, *glob_name;
   const char *prefix;
   char num[10];
 {
   char *dot_name, *flag_name, *glob_name;
   const char *prefix;
   char num[10];

-  int flags;
+  int flags, id;

 
   /* See below in next_pass_1.  */
   num[0] = '\0';
 
   /* See below in next_pass_1.  */
   num[0] = '\0';


@@ -319,23 +383,23 @@ register_one_dump_file (struct tree_opt_pass *pass, bool ipa, int properties)
                         ? 1 : pass->static_pass_number));
 
   dot_name = concat (".", pass->name, num, NULL);
                         ? 1 : pass->static_pass_number));
 
   dot_name = concat (".", pass->name, num, NULL);

-  if (ipa)
+  if (pass->type == SIMPLE_IPA_PASS || pass->type == IPA_PASS)

     prefix = "ipa-", flags = TDF_IPA;
     prefix = "ipa-", flags = TDF_IPA;

-  else if (properties & PROP_trees)
+  else if (pass->type == GIMPLE_PASS)

     prefix = "tree-", flags = TDF_TREE;
   else
     prefix = "rtl-", flags = TDF_RTL;
 
   flag_name = concat (prefix, pass->name, num, NULL);
   glob_name = concat (prefix, pass->name, NULL);
     prefix = "tree-", flags = TDF_TREE;
   else
     prefix = "rtl-", flags = TDF_RTL;
 
   flag_name = concat (prefix, pass->name, num, NULL);
   glob_name = concat (prefix, pass->name, NULL);

-  pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
-                                            flags, pass->letter);
+  id = dump_register (dot_name, flag_name, glob_name, flags);
+  set_pass_for_id (id, pass);

 }
 
 /* Recursive worker function for register_dump_files.  */
 
 static int 
 }
 
 /* Recursive worker function for register_dump_files.  */
 
 static int 

-register_dump_files_1 (struct tree_opt_pass *pass, bool ipa, int properties)
+register_dump_files_1 (struct opt_pass *pass, int properties)

 {
   do
     {
 {
   do
     {


@@ -343,11 +407,10 @@ register_dump_files_1 (struct tree_opt_pass *pass, bool ipa, int properties)
                           & ~pass->properties_destroyed;
 
       if (pass->name)
                           & ~pass->properties_destroyed;
 
       if (pass->name)

-        register_one_dump_file (pass, ipa, new_properties);
+        register_one_dump_file (pass);

 
       if (pass->sub)
 
       if (pass->sub)

-        new_properties = register_dump_files_1 (pass->sub, false,
-                                               new_properties);
+        new_properties = register_dump_files_1 (pass->sub, new_properties);

 
       /* If we have a gate, combine the properties that we could have with
          and without the pass being examined.  */
 
       /* If we have a gate, combine the properties that we could have with
          and without the pass being examined.  */


@@ -363,32 +426,34 @@ register_dump_files_1 (struct tree_opt_pass *pass, bool ipa, int properties)
   return properties;
 }
 
   return properties;
 }
 

-/* Register the dump files for the pipeline starting at PASS.  IPA is
-   true if the pass is inter-procedural, and PROPERTIES reflects the
-   properties that are guaranteed to be available at the beginning of
-   the pipeline.  */
+/* Register the dump files for the pipeline starting at PASS. 
+   PROPERTIES reflects the properties that are guaranteed to be available at
+   the beginning of the pipeline.  */

 
 static void 
 
 static void 

-register_dump_files (struct tree_opt_pass *pass, bool ipa, int properties)
+register_dump_files (struct opt_pass *pass,int properties)

 {
   pass->properties_required |= properties;
 {
   pass->properties_required |= properties;

-  register_dump_files_1 (pass, ipa, properties);
+  register_dump_files_1 (pass, properties);

 }
 
 /* Add a pass to the pass list. Duplicate the pass if it's already
    in the list.  */
 
 }
 
 /* Add a pass to the pass list. Duplicate the pass if it's already
    in the list.  */
 

-static struct tree_opt_pass **
-next_pass_1 (struct tree_opt_pass **list, struct tree_opt_pass *pass)
+static struct opt_pass **
+next_pass_1 (struct opt_pass **list, struct opt_pass *pass)

 {
   /* A nonzero static_pass_number indicates that the
      pass is already in the list.  */
   if (pass->static_pass_number)
     {
 {
   /* A nonzero static_pass_number indicates that the
      pass is already in the list.  */
   if (pass->static_pass_number)
     {

-      struct tree_opt_pass *new;
+      struct opt_pass *new;

 
 

-      new = xmalloc (sizeof (*new));
+      new = XNEW (struct opt_pass);

       memcpy (new, pass, sizeof (*new));
       memcpy (new, pass, sizeof (*new));

+      new->next = NULL;
+
+      new->todo_flags_start &= ~TODO_mark_first_instance;

 
       /* Indicate to register_dump_files that this pass has duplicates,
          and so it should rename the dump file.  The first instance will
 
       /* Indicate to register_dump_files that this pass has duplicates,
          and so it should rename the dump file.  The first instance will


@@ -404,6 +469,7 @@ next_pass_1 (struct tree_opt_pass **list, struct tree_opt_pass *pass)
     }
   else
     {
     }
   else
     {

+      pass->todo_flags_start |= TODO_mark_first_instance;

       pass->static_pass_number = -1;
       *list = pass;
     }  
       pass->static_pass_number = -1;
       *list = pass;
     }  


@@ -412,6 +478,7 @@ next_pass_1 (struct tree_opt_pass **list, struct tree_opt_pass *pass)
           
 }
 
           
 }
 

+

 /* Construct the pass tree.  The sequencing of passes is driven by
    the cgraph routines:
 
 /* Construct the pass tree.  The sequencing of passes is driven by
    the cgraph routines:
 


@@ -427,45 +494,26 @@ next_pass_1 (struct tree_opt_pass **list, struct tree_opt_pass *pass)
        cgraph_expand_all_functions ()
            for each node N in the cgraph
               cgraph_expand_function (N)
        cgraph_expand_all_functions ()
            for each node N in the cgraph
               cgraph_expand_function (N)

-                  cgraph_lower_function (N)    -> Now a NOP.
-                  lang_hooks.callgraph.expand_function (DECL (N))
-                       tree_rest_of_compilation (DECL (N))  -> all_passes
+                 tree_rest_of_compilation (DECL (N))  -> all_passes

 */
 
 void
 init_optimization_passes (void)
 {
 */
 
 void
 init_optimization_passes (void)
 {

-  struct tree_opt_pass **p;
-
-#define NEXT_PASS(PASS)  (p = next_pass_1 (p, &PASS))
-
-  /* Interprocedural optimization passes.  */
-  p = &all_ipa_passes;
-  NEXT_PASS (pass_ipa_function_and_variable_visibility);
-  NEXT_PASS (pass_ipa_early_inline);
-  NEXT_PASS (pass_early_local_passes);
-  NEXT_PASS (pass_ipa_increase_alignment);
-  NEXT_PASS (pass_ipa_cp);
-  NEXT_PASS (pass_ipa_inline);
-  NEXT_PASS (pass_ipa_reference);
-  NEXT_PASS (pass_ipa_pure_const); 
-  NEXT_PASS (pass_ipa_type_escape);
-  NEXT_PASS (pass_ipa_pta);
-  *p = NULL;
+  struct opt_pass **p;

 
 

-  p = &pass_ipa_early_inline.sub;
-  NEXT_PASS (pass_early_inline);
-  NEXT_PASS (pass_inline_parameters);
-  NEXT_PASS (pass_rebuild_cgraph_edges);
-  *p = NULL;
+#define NEXT_PASS(PASS)  (p = next_pass_1 (p, &((PASS).pass)))

 
 

-  /* All passes needed to lower the function into shape optimizers can
-     operate on.  */
+ /* All passes needed to lower the function into shape optimizers can
+    operate on.  These passes are always run first on the function, but
+    backend might produce already lowered functions that are not processed
+    by these passes.  */

   p = &all_lowering_passes;
   NEXT_PASS (pass_remove_useless_stmts);
   NEXT_PASS (pass_mudflap_1);
   NEXT_PASS (pass_lower_omp);
   NEXT_PASS (pass_lower_cf);
   p = &all_lowering_passes;
   NEXT_PASS (pass_remove_useless_stmts);
   NEXT_PASS (pass_mudflap_1);
   NEXT_PASS (pass_lower_omp);
   NEXT_PASS (pass_lower_cf);

+  NEXT_PASS (pass_refactor_eh);

   NEXT_PASS (pass_lower_eh);
   NEXT_PASS (pass_build_cfg);
   NEXT_PASS (pass_lower_complex_O0);
   NEXT_PASS (pass_lower_eh);
   NEXT_PASS (pass_build_cfg);
   NEXT_PASS (pass_lower_complex_O0);


@@ -475,264 +523,316 @@ init_optimization_passes (void)
   NEXT_PASS (pass_inline_parameters);
   *p = NULL;
 
   NEXT_PASS (pass_inline_parameters);
   *p = NULL;
 

-  p = &pass_early_local_passes.sub;
-  NEXT_PASS (pass_tree_profile);
-  NEXT_PASS (pass_cleanup_cfg);
-  NEXT_PASS (pass_init_datastructures);
-  NEXT_PASS (pass_expand_omp);
-  NEXT_PASS (pass_all_early_optimizations);
-  NEXT_PASS (pass_rebuild_cgraph_edges);
-  NEXT_PASS (pass_inline_parameters);
-  *p = NULL;
-
-  p = &pass_all_early_optimizations.sub;
-  NEXT_PASS (pass_referenced_vars);
-  NEXT_PASS (pass_reset_cc_flags);
-  NEXT_PASS (pass_build_ssa);
-  NEXT_PASS (pass_early_warn_uninitialized);
-  NEXT_PASS (pass_rebuild_cgraph_edges);
-  NEXT_PASS (pass_early_inline);
-  NEXT_PASS (pass_cleanup_cfg);
-  NEXT_PASS (pass_rename_ssa_copies);
-  NEXT_PASS (pass_ccp);
-  
-  NEXT_PASS (pass_forwprop);
-  NEXT_PASS (pass_sra);
-  NEXT_PASS (pass_copy_prop);
-  NEXT_PASS (pass_merge_phi);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_tail_recursion);
-  NEXT_PASS (pass_release_ssa_names);
-
+  /* Interprocedural optimization passes.  */
+  p = &all_ipa_passes;
+  NEXT_PASS (pass_ipa_function_and_variable_visibility);
+  NEXT_PASS (pass_ipa_early_inline);
+    {
+      struct opt_pass **p = &pass_ipa_early_inline.pass.sub;
+      NEXT_PASS (pass_early_inline);
+      NEXT_PASS (pass_inline_parameters);
+      NEXT_PASS (pass_rebuild_cgraph_edges);
+    }
+  NEXT_PASS (pass_early_local_passes);
+    {
+      struct opt_pass **p = &pass_early_local_passes.pass.sub;
+      NEXT_PASS (pass_tree_profile);
+      NEXT_PASS (pass_cleanup_cfg);
+      NEXT_PASS (pass_init_datastructures);
+      NEXT_PASS (pass_expand_omp);
+
+      NEXT_PASS (pass_referenced_vars);
+      NEXT_PASS (pass_reset_cc_flags);
+      NEXT_PASS (pass_build_ssa);
+      NEXT_PASS (pass_all_early_optimizations);
+       {
+         struct opt_pass **p = &pass_all_early_optimizations.pass.sub;
+         NEXT_PASS (pass_early_warn_uninitialized);
+         NEXT_PASS (pass_rebuild_cgraph_edges);
+         NEXT_PASS (pass_early_inline);
+         NEXT_PASS (pass_cleanup_cfg);
+         NEXT_PASS (pass_rename_ssa_copies);
+         NEXT_PASS (pass_ccp);
+         NEXT_PASS (pass_forwprop);
+         NEXT_PASS (pass_update_address_taken);
+         NEXT_PASS (pass_simple_dse);
+         NEXT_PASS (pass_sra_early);
+         NEXT_PASS (pass_copy_prop);
+         NEXT_PASS (pass_merge_phi);
+         NEXT_PASS (pass_dce);
+          /* Ideally the function call conditional 
+             dead code elimination phase can be delayed
+             till later where potentially more opportunities
+             can be found.  Due to lack of good ways to
+             update VDEFs associated with the shrink-wrapped
+             calls, it is better to do the transformation
+             here where memory SSA is not built yet.  */
+         NEXT_PASS (pass_call_cdce);
+         NEXT_PASS (pass_update_address_taken);
+         NEXT_PASS (pass_simple_dse);
+         NEXT_PASS (pass_tail_recursion);
+         NEXT_PASS (pass_convert_switch);
+          NEXT_PASS (pass_profile);
+       }
+      NEXT_PASS (pass_release_ssa_names);
+      NEXT_PASS (pass_rebuild_cgraph_edges);
+    }
+  NEXT_PASS (pass_ipa_increase_alignment);
+  NEXT_PASS (pass_ipa_matrix_reorg);
+  NEXT_PASS (pass_ipa_cp);
+  NEXT_PASS (pass_ipa_inline);
+  NEXT_PASS (pass_ipa_reference);
+  NEXT_PASS (pass_ipa_pure_const); 
+  NEXT_PASS (pass_ipa_type_escape);
+  NEXT_PASS (pass_ipa_pta);
+  NEXT_PASS (pass_ipa_struct_reorg);  

   *p = NULL;
 
   *p = NULL;
 

+  /* These passes are run after IPA passes on every function that is being
+     output to the assembler file.  */

   p = &all_passes;
   p = &all_passes;

-  NEXT_PASS (pass_apply_inline);

   NEXT_PASS (pass_all_optimizations);
   NEXT_PASS (pass_all_optimizations);

+    {
+      struct opt_pass **p = &pass_all_optimizations.pass.sub;
+      /* pass_build_alias is a dummy pass that ensures that we
+        execute TODO_rebuild_alias at this point.  */
+      NEXT_PASS (pass_build_alias);
+      NEXT_PASS (pass_return_slot);
+      NEXT_PASS (pass_rename_ssa_copies);
+
+      /* Initial scalar cleanups.  */
+      NEXT_PASS (pass_complete_unrolli);
+      NEXT_PASS (pass_ccp);
+      NEXT_PASS (pass_phiprop);
+      NEXT_PASS (pass_fre);
+      NEXT_PASS (pass_dce);
+      NEXT_PASS (pass_forwprop);
+      NEXT_PASS (pass_copy_prop);
+      NEXT_PASS (pass_merge_phi);
+      NEXT_PASS (pass_vrp);
+      NEXT_PASS (pass_dce);
+      NEXT_PASS (pass_cselim);
+      NEXT_PASS (pass_dominator);
+      /* The only const/copy propagation opportunities left after
+        DOM should be due to degenerate PHI nodes.  So rather than
+        run the full propagators, run a specialized pass which
+        only examines PHIs to discover const/copy propagation
+        opportunities.  */
+      NEXT_PASS (pass_phi_only_cprop);
+      NEXT_PASS (pass_tree_ifcombine);
+      NEXT_PASS (pass_phiopt);
+      NEXT_PASS (pass_tail_recursion);
+      NEXT_PASS (pass_ch);
+      NEXT_PASS (pass_stdarg);
+      NEXT_PASS (pass_lower_complex);
+      NEXT_PASS (pass_sra);
+      NEXT_PASS (pass_rename_ssa_copies);
+      NEXT_PASS (pass_dominator);
+
+      /* The only const/copy propagation opportunities left after
+        DOM should be due to degenerate PHI nodes.  So rather than
+        run the full propagators, run a specialized pass which
+        only examines PHIs to discover const/copy propagation
+        opportunities.  */
+      NEXT_PASS (pass_phi_only_cprop);
+
+      NEXT_PASS (pass_reassoc);
+      NEXT_PASS (pass_dce);
+      NEXT_PASS (pass_dse);
+      NEXT_PASS (pass_forwprop);
+      NEXT_PASS (pass_phiopt);
+      NEXT_PASS (pass_object_sizes);
+      NEXT_PASS (pass_store_ccp);
+      NEXT_PASS (pass_copy_prop);
+      NEXT_PASS (pass_fold_builtins);
+      NEXT_PASS (pass_cse_sincos);
+      NEXT_PASS (pass_split_crit_edges);
+      NEXT_PASS (pass_pre);
+      NEXT_PASS (pass_sink_code);
+      NEXT_PASS (pass_tree_loop);
+       {
+         struct opt_pass **p = &pass_tree_loop.pass.sub;
+         NEXT_PASS (pass_tree_loop_init);
+         NEXT_PASS (pass_copy_prop);
+         NEXT_PASS (pass_dce_loop);
+         NEXT_PASS (pass_lim);
+         NEXT_PASS (pass_predcom);
+         NEXT_PASS (pass_tree_unswitch);
+         NEXT_PASS (pass_scev_cprop);
+         NEXT_PASS (pass_empty_loop);
+         NEXT_PASS (pass_record_bounds);
+         NEXT_PASS (pass_check_data_deps);
+         NEXT_PASS (pass_loop_distribution);
+         NEXT_PASS (pass_linear_transform);
+         NEXT_PASS (pass_iv_canon);
+         NEXT_PASS (pass_if_conversion);
+         NEXT_PASS (pass_vectorize);
+           {
+             struct opt_pass **p = &pass_vectorize.pass.sub;
+             NEXT_PASS (pass_lower_vector_ssa);
+             NEXT_PASS (pass_dce_loop);
+           }
+         NEXT_PASS (pass_complete_unroll);
+         NEXT_PASS (pass_parallelize_loops);
+         NEXT_PASS (pass_loop_prefetch);
+         NEXT_PASS (pass_iv_optimize);
+         NEXT_PASS (pass_tree_loop_done);
+       }
+      NEXT_PASS (pass_cse_reciprocals);
+      NEXT_PASS (pass_convert_to_rsqrt);
+      NEXT_PASS (pass_reassoc);
+      NEXT_PASS (pass_vrp);
+      NEXT_PASS (pass_dominator);
+      
+      /* The only const/copy propagation opportunities left after
+        DOM should be due to degenerate PHI nodes.  So rather than
+        run the full propagators, run a specialized pass which
+        only examines PHIs to discover const/copy propagation
+        opportunities.  */
+      NEXT_PASS (pass_phi_only_cprop);
+
+      NEXT_PASS (pass_cd_dce);
+      NEXT_PASS (pass_tracer);
+
+      /* FIXME: If DCE is not run before checking for uninitialized uses,
+        we may get false warnings (e.g., testsuite/gcc.dg/uninit-5.c).
+        However, this also causes us to misdiagnose cases that should be
+        real warnings (e.g., testsuite/gcc.dg/pr18501.c).
+        
+        To fix the false positives in uninit-5.c, we would have to
+        account for the predicates protecting the set and the use of each
+        variable.  Using a representation like Gated Single Assignment
+        may help.  */
+      NEXT_PASS (pass_late_warn_uninitialized);
+      NEXT_PASS (pass_dse);
+      NEXT_PASS (pass_forwprop);
+      NEXT_PASS (pass_phiopt);
+      NEXT_PASS (pass_tail_calls);
+      NEXT_PASS (pass_rename_ssa_copies);
+      NEXT_PASS (pass_uncprop);
+    }
+  NEXT_PASS (pass_del_ssa);
+  NEXT_PASS (pass_nrv);
+  NEXT_PASS (pass_mark_used_blocks);
+  NEXT_PASS (pass_cleanup_cfg_post_optimizing);
+

   NEXT_PASS (pass_warn_function_noreturn);
   NEXT_PASS (pass_free_datastructures);
   NEXT_PASS (pass_mudflap_2);
   NEXT_PASS (pass_free_cfg_annotations);
   NEXT_PASS (pass_expand);
   NEXT_PASS (pass_rest_of_compilation);
   NEXT_PASS (pass_warn_function_noreturn);
   NEXT_PASS (pass_free_datastructures);
   NEXT_PASS (pass_mudflap_2);
   NEXT_PASS (pass_free_cfg_annotations);
   NEXT_PASS (pass_expand);
   NEXT_PASS (pass_rest_of_compilation);

+    {
+      struct opt_pass **p = &pass_rest_of_compilation.pass.sub;
+      NEXT_PASS (pass_init_function);
+      NEXT_PASS (pass_jump);
+      NEXT_PASS (pass_rtl_eh);
+      NEXT_PASS (pass_initial_value_sets);
+      NEXT_PASS (pass_unshare_all_rtl);
+      NEXT_PASS (pass_instantiate_virtual_regs);
+      NEXT_PASS (pass_into_cfg_layout_mode);
+      NEXT_PASS (pass_jump2);
+      NEXT_PASS (pass_lower_subreg);
+      NEXT_PASS (pass_df_initialize_opt);
+      NEXT_PASS (pass_cse);
+      NEXT_PASS (pass_rtl_fwprop);
+      NEXT_PASS (pass_gcse);
+      NEXT_PASS (pass_rtl_ifcvt);
+      /* Perform loop optimizations.  It might be better to do them a bit
+        sooner, but we want the profile feedback to work more
+        efficiently.  */
+      NEXT_PASS (pass_loop2);
+       {
+         struct opt_pass **p = &pass_loop2.pass.sub;
+         NEXT_PASS (pass_rtl_loop_init);
+         NEXT_PASS (pass_rtl_move_loop_invariants);
+         NEXT_PASS (pass_rtl_unswitch);
+         NEXT_PASS (pass_rtl_unroll_and_peel_loops);
+         NEXT_PASS (pass_rtl_doloop);
+         NEXT_PASS (pass_rtl_loop_done);
+         *p = NULL;
+       }
+      NEXT_PASS (pass_web);
+      NEXT_PASS (pass_jump_bypass);
+      NEXT_PASS (pass_cse2);
+      NEXT_PASS (pass_rtl_dse1);
+      NEXT_PASS (pass_rtl_fwprop_addr);
+      NEXT_PASS (pass_regclass_init);
+      NEXT_PASS (pass_inc_dec);
+      NEXT_PASS (pass_initialize_regs);
+      NEXT_PASS (pass_outof_cfg_layout_mode);
+      NEXT_PASS (pass_ud_rtl_dce);
+      NEXT_PASS (pass_combine);
+      NEXT_PASS (pass_if_after_combine);
+      NEXT_PASS (pass_partition_blocks);
+      NEXT_PASS (pass_regmove);
+      NEXT_PASS (pass_split_all_insns);
+      NEXT_PASS (pass_lower_subreg2);
+      NEXT_PASS (pass_df_initialize_no_opt);
+      NEXT_PASS (pass_stack_ptr_mod);
+      NEXT_PASS (pass_mode_switching);
+      NEXT_PASS (pass_see);
+      NEXT_PASS (pass_match_asm_constraints);
+      NEXT_PASS (pass_sms);
+      NEXT_PASS (pass_sched);
+      NEXT_PASS (pass_subregs_of_mode_init);
+      NEXT_PASS (pass_local_alloc);
+      NEXT_PASS (pass_global_alloc);
+      NEXT_PASS (pass_subregs_of_mode_finish);
+      NEXT_PASS (pass_postreload);
+       {
+         struct opt_pass **p = &pass_postreload.pass.sub;
+         NEXT_PASS (pass_postreload_cse);
+         NEXT_PASS (pass_gcse2);
+         NEXT_PASS (pass_split_after_reload);
+         NEXT_PASS (pass_branch_target_load_optimize1);
+         NEXT_PASS (pass_thread_prologue_and_epilogue);
+         NEXT_PASS (pass_rtl_dse2);
+         NEXT_PASS (pass_rtl_seqabstr);
+         NEXT_PASS (pass_stack_adjustments);
+         NEXT_PASS (pass_peephole2);
+         NEXT_PASS (pass_if_after_reload);
+         NEXT_PASS (pass_regrename);
+         NEXT_PASS (pass_cprop_hardreg);
+         NEXT_PASS (pass_fast_rtl_dce);
+         NEXT_PASS (pass_reorder_blocks);
+         NEXT_PASS (pass_branch_target_load_optimize2);
+         NEXT_PASS (pass_leaf_regs);
+         NEXT_PASS (pass_split_before_sched2);
+         NEXT_PASS (pass_sched2);
+         NEXT_PASS (pass_stack_regs);
+           {
+             struct opt_pass **p = &pass_stack_regs.pass.sub;
+             NEXT_PASS (pass_split_before_regstack);
+             NEXT_PASS (pass_stack_regs_run);
+           }
+         NEXT_PASS (pass_compute_alignments);
+         NEXT_PASS (pass_duplicate_computed_gotos);
+         NEXT_PASS (pass_variable_tracking);
+         NEXT_PASS (pass_free_cfg);
+         NEXT_PASS (pass_machine_reorg);
+         NEXT_PASS (pass_cleanup_barriers);
+         NEXT_PASS (pass_delay_slots);
+         NEXT_PASS (pass_split_for_shorten_branches);
+         NEXT_PASS (pass_convert_to_eh_region_ranges);
+         NEXT_PASS (pass_shorten_branches);
+         NEXT_PASS (pass_set_nothrow_function_flags);
+         NEXT_PASS (pass_final);
+       }
+      NEXT_PASS (pass_df_finish);
+    }

   NEXT_PASS (pass_clean_state);
   *p = NULL;
 
   NEXT_PASS (pass_clean_state);
   *p = NULL;
 

-  p = &pass_all_optimizations.sub;
-  NEXT_PASS (pass_create_structure_vars);
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_return_slot);
-  NEXT_PASS (pass_rename_ssa_copies);
-
-  /* Initial scalar cleanups.  */
-  NEXT_PASS (pass_ccp);
-  NEXT_PASS (pass_fre);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_forwprop);
-  NEXT_PASS (pass_copy_prop);
-  NEXT_PASS (pass_merge_phi);
-  NEXT_PASS (pass_vrp);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_dominator);
-
-  /* The only const/copy propagation opportunities left after
-     DOM should be due to degenerate PHI nodes.  So rather than
-     run the full propagators, run a specialized pass which
-     only examines PHIs to discover const/copy propagation
-     opportunities.  */
-  NEXT_PASS (pass_phi_only_cprop);
-
-  NEXT_PASS (pass_phiopt);
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_tail_recursion);
-  NEXT_PASS (pass_profile);
-  NEXT_PASS (pass_ch);
-  NEXT_PASS (pass_stdarg);
-  NEXT_PASS (pass_lower_complex);
-  NEXT_PASS (pass_sra);
-  /* FIXME: SRA may generate arbitrary gimple code, exposing new
-     aliased and call-clobbered variables.  As mentioned below,
-     pass_may_alias should be a TODO item.  */
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_rename_ssa_copies);
-  NEXT_PASS (pass_dominator);
-
-  /* The only const/copy propagation opportunities left after
-     DOM should be due to degenerate PHI nodes.  So rather than
-     run the full propagators, run a specialized pass which
-     only examines PHIs to discover const/copy propagation
-     opportunities.  */
-  NEXT_PASS (pass_phi_only_cprop);
-
-  NEXT_PASS (pass_reassoc);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_dse);
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_forwprop);
-  NEXT_PASS (pass_phiopt);
-  NEXT_PASS (pass_object_sizes);
-  NEXT_PASS (pass_store_ccp);
-  NEXT_PASS (pass_store_copy_prop);
-  NEXT_PASS (pass_fold_builtins);
-  NEXT_PASS (pass_cse_sincos);
-  /* FIXME: May alias should a TODO but for 4.0.0,
-     we add may_alias right after fold builtins
-     which can create arbitrary GIMPLE.  */
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_split_crit_edges);
-  NEXT_PASS (pass_pre);
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_sink_code);
-  NEXT_PASS (pass_tree_loop);
-  NEXT_PASS (pass_cse_reciprocals);
-  NEXT_PASS (pass_reassoc);
-  NEXT_PASS (pass_vrp);
-  NEXT_PASS (pass_dominator);
-
-  /* The only const/copy propagation opportunities left after
-     DOM should be due to degenerate PHI nodes.  So rather than
-     run the full propagators, run a specialized pass which
-     only examines PHIs to discover const/copy propagation
-     opportunities.  */
-  NEXT_PASS (pass_phi_only_cprop);
-
-  NEXT_PASS (pass_cd_dce);
-
-  /* FIXME: If DCE is not run before checking for uninitialized uses,
-     we may get false warnings (e.g., testsuite/gcc.dg/uninit-5.c).
-     However, this also causes us to misdiagnose cases that should be
-     real warnings (e.g., testsuite/gcc.dg/pr18501.c).
-     
-     To fix the false positives in uninit-5.c, we would have to
-     account for the predicates protecting the set and the use of each
-     variable.  Using a representation like Gated Single Assignment
-     may help.  */
-  NEXT_PASS (pass_late_warn_uninitialized);
-  NEXT_PASS (pass_dse);
-  NEXT_PASS (pass_forwprop);
-  NEXT_PASS (pass_phiopt);
-  NEXT_PASS (pass_tail_calls);
-  NEXT_PASS (pass_rename_ssa_copies);
-  NEXT_PASS (pass_uncprop);
-  NEXT_PASS (pass_del_ssa);
-  NEXT_PASS (pass_nrv);
-  NEXT_PASS (pass_mark_used_blocks);
-  NEXT_PASS (pass_cleanup_cfg_post_optimizing);
-  *p = NULL;
-
-  p = &pass_tree_loop.sub;
-  NEXT_PASS (pass_tree_loop_init);
-  NEXT_PASS (pass_copy_prop);
-  NEXT_PASS (pass_lim);
-  NEXT_PASS (pass_tree_unswitch);
-  NEXT_PASS (pass_scev_cprop);
-  NEXT_PASS (pass_empty_loop);
-  NEXT_PASS (pass_record_bounds);
-  NEXT_PASS (pass_linear_transform);
-  NEXT_PASS (pass_iv_canon);
-  NEXT_PASS (pass_if_conversion);
-  NEXT_PASS (pass_vectorize);
-  /* NEXT_PASS (pass_may_alias) cannot be done again because the
-     vectorizer creates alias relations that are not supported by
-     pass_may_alias.  */
-  NEXT_PASS (pass_complete_unroll);
-  NEXT_PASS (pass_loop_prefetch);
-  NEXT_PASS (pass_iv_optimize);
-  NEXT_PASS (pass_tree_loop_done);
-  *p = NULL;
-
-  p = &pass_vectorize.sub;
-  NEXT_PASS (pass_lower_vector_ssa);
-  NEXT_PASS (pass_dce_loop);
-  *p = NULL;
-
-  p = &pass_loop2.sub;
-  NEXT_PASS (pass_rtl_loop_init);
-  NEXT_PASS (pass_rtl_move_loop_invariants);
-  NEXT_PASS (pass_rtl_unswitch);
-  NEXT_PASS (pass_rtl_unroll_and_peel_loops);
-  NEXT_PASS (pass_rtl_doloop);
-  NEXT_PASS (pass_rtl_loop_done);
-  *p = NULL;
-  
-  p = &pass_rest_of_compilation.sub;
-  NEXT_PASS (pass_init_function);
-  NEXT_PASS (pass_jump);
-  NEXT_PASS (pass_insn_locators_initialize);
-  NEXT_PASS (pass_rtl_eh);
-  NEXT_PASS (pass_initial_value_sets);
-  NEXT_PASS (pass_unshare_all_rtl);
-  NEXT_PASS (pass_instantiate_virtual_regs);
-  NEXT_PASS (pass_jump2);
-  NEXT_PASS (pass_lower_subreg);
-  NEXT_PASS (pass_cse);
-  NEXT_PASS (pass_rtl_fwprop);
-  NEXT_PASS (pass_gcse);
-  NEXT_PASS (pass_jump_bypass);
-  NEXT_PASS (pass_rtl_ifcvt);
-  NEXT_PASS (pass_tracer);
-  /* Perform loop optimizations.  It might be better to do them a bit
-     sooner, but we want the profile feedback to work more
-     efficiently.  */
-  NEXT_PASS (pass_loop2);
-  NEXT_PASS (pass_web);
-  NEXT_PASS (pass_cse2);
-  NEXT_PASS (pass_rtl_fwprop_addr);
-  NEXT_PASS (pass_life);
-  NEXT_PASS (pass_combine);
-  NEXT_PASS (pass_if_after_combine);
-  NEXT_PASS (pass_partition_blocks);
-  NEXT_PASS (pass_regmove);
-  NEXT_PASS (pass_split_all_insns);
-  NEXT_PASS (pass_lower_subreg2);
-  NEXT_PASS (pass_mode_switching);
-  NEXT_PASS (pass_see);
-  NEXT_PASS (pass_recompute_reg_usage);
-  NEXT_PASS (pass_sms);
-  NEXT_PASS (pass_sched);
-  NEXT_PASS (pass_local_alloc);
-  NEXT_PASS (pass_global_alloc);
-  NEXT_PASS (pass_postreload);
-  *p = NULL;
-
-  p = &pass_postreload.sub;
-  NEXT_PASS (pass_postreload_cse);
-  NEXT_PASS (pass_gcse2);
-  NEXT_PASS (pass_flow2);
-  NEXT_PASS (pass_rtl_seqabstr);
-  NEXT_PASS (pass_stack_adjustments);
-  NEXT_PASS (pass_peephole2);
-  NEXT_PASS (pass_if_after_reload);
-  NEXT_PASS (pass_regrename);
-  NEXT_PASS (pass_reorder_blocks);
-  NEXT_PASS (pass_branch_target_load_optimize);
-  NEXT_PASS (pass_leaf_regs);
-  NEXT_PASS (pass_sched2);
-  NEXT_PASS (pass_split_before_regstack);
-  NEXT_PASS (pass_stack_regs);
-  NEXT_PASS (pass_compute_alignments);
-  NEXT_PASS (pass_duplicate_computed_gotos);
-  NEXT_PASS (pass_variable_tracking);
-  NEXT_PASS (pass_free_cfg);
-  NEXT_PASS (pass_machine_reorg);
-  NEXT_PASS (pass_cleanup_barriers);
-  NEXT_PASS (pass_delay_slots);
-  NEXT_PASS (pass_split_for_shorten_branches);
-  NEXT_PASS (pass_convert_to_eh_region_ranges);
-  NEXT_PASS (pass_shorten_branches);
-  NEXT_PASS (pass_set_nothrow_function_flags);
-  NEXT_PASS (pass_final);
-  *p = NULL;
-

 #undef NEXT_PASS
 
   /* Register the passes with the tree dump code.  */
 #undef NEXT_PASS
 
   /* Register the passes with the tree dump code.  */

-  register_dump_files (all_lowering_passes, false, PROP_gimple_any);
+  register_dump_files (all_lowering_passes, PROP_gimple_any);

   all_lowering_passes->todo_flags_start |= TODO_set_props;
   all_lowering_passes->todo_flags_start |= TODO_set_props;

-  register_dump_files (all_ipa_passes, true,
+  register_dump_files (all_ipa_passes, 

                       PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh
                       | PROP_cfg);
                       PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh
                       | PROP_cfg);

-  register_dump_files (all_passes, false,
+  register_dump_files (all_passes, 

                       PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh
                       | PROP_cfg);
 }
                       PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh
                       | PROP_cfg);
 }


@@ -784,7 +884,7 @@ do_per_function_toporder (void (*callback) (void *data), void *data)
   else
     {
       gcc_assert (!order);
   else
     {
       gcc_assert (!order);

-      order = ggc_alloc (sizeof (*order) * cgraph_n_nodes);
+      order = GGC_NEWVEC (struct cgraph_node *, cgraph_n_nodes);

       nnodes = cgraph_postorder (order);
       for (i = nnodes - 1; i >= 0; i--)
        {
       nnodes = cgraph_postorder (order);
       for (i = nnodes - 1; i >= 0; i--)
        {


@@ -821,16 +921,13 @@ execute_function_todo (void *data)
   flags &= ~cfun->last_verified;
   if (!flags)
     return;
   flags &= ~cfun->last_verified;
   if (!flags)
     return;

-  
+
+  statistics_fini_pass ();
+

   /* Always cleanup the CFG before trying to update SSA.  */
   if (flags & TODO_cleanup_cfg)
     {
   /* Always cleanup the CFG before trying to update SSA.  */
   if (flags & TODO_cleanup_cfg)
     {

-      bool cleanup;
-
-      if (current_loops)
-       cleanup = cleanup_tree_cfg_loop ();
-      else
-       cleanup = cleanup_tree_cfg ();
+      bool cleanup = cleanup_tree_cfg ();

 
       if (cleanup && (cfun->curr_properties & PROP_ssa))
        flags |= TODO_remove_unused_locals;
 
       if (cleanup && (cfun->curr_properties & PROP_ssa))
        flags |= TODO_remove_unused_locals;


@@ -851,7 +948,13 @@ execute_function_todo (void *data)
       update_ssa (update_flags);
       cfun->last_verified &= ~TODO_verify_ssa;
     }
       update_ssa (update_flags);
       cfun->last_verified &= ~TODO_verify_ssa;
     }

-
+  
+  if (flags & TODO_rebuild_alias)
+    {
+      compute_may_aliases ();
+      cfun->curr_properties |= PROP_alias;
+    }
+  

   if (flags & TODO_remove_unused_locals)
     remove_unused_locals ();
 
   if (flags & TODO_remove_unused_locals)
     remove_unused_locals ();
 


@@ -882,6 +985,24 @@ execute_function_todo (void *data)
       fflush (dump_file);
     }
 
       fflush (dump_file);
     }
 

+  if (flags & TODO_rebuild_frequencies)
+    {
+      if (profile_status == PROFILE_GUESSED)
+       {
+         loop_optimizer_init (0);
+         add_noreturn_fake_exit_edges ();
+         mark_irreducible_loops ();
+         connect_infinite_loops_to_exit ();
+         estimate_bb_frequencies ();
+         remove_fake_exit_edges ();
+         loop_optimizer_finalize ();
+       }
+      else if (profile_status == PROFILE_READ)
+       counts_to_freqs ();
+      else
+       gcc_unreachable ();
+    }
+

 #if defined ENABLE_CHECKING
   if (flags & TODO_verify_ssa)
     verify_ssa (true);
 #if defined ENABLE_CHECKING
   if (flags & TODO_verify_ssa)
     verify_ssa (true);


@@ -891,6 +1012,8 @@ execute_function_todo (void *data)
     verify_stmts ();
   if (flags & TODO_verify_loops)
     verify_loop_closed_ssa ();
     verify_stmts ();
   if (flags & TODO_verify_loops)
     verify_loop_closed_ssa ();

+  if (flags & TODO_verify_rtl_sharing)
+    verify_rtl_sharing ();

 #endif
 
   cfun->last_verified = flags & TODO_verify_all;
 #endif
 
   cfun->last_verified = flags & TODO_verify_all;


@@ -905,6 +1028,9 @@ execute_todo (unsigned int flags)
     gcc_assert (flags & TODO_update_ssa_any);
 #endif
 
     gcc_assert (flags & TODO_update_ssa_any);
 #endif
 

+  /* Inform the pass whether it is the first time it is run.  */
+  first_pass_instance = (flags & TODO_mark_first_instance) != 0;
+

   do_per_function (execute_function_todo, (void *)(size_t) flags);
 
   /* Always remove functions just as before inlining: IPA passes might be
   do_per_function (execute_function_todo, (void *)(size_t) flags);
 
   /* Always remove functions just as before inlining: IPA passes might be


@@ -912,11 +1038,15 @@ execute_todo (unsigned int flags)
      to analyze side effects.  The full removal is done just at the end
      of IPA pass queue.  */
   if (flags & TODO_remove_functions)
      to analyze side effects.  The full removal is done just at the end
      of IPA pass queue.  */
   if (flags & TODO_remove_functions)

-    cgraph_remove_unreachable_nodes (true, dump_file);
+    {
+      gcc_assert (!cfun);
+      cgraph_remove_unreachable_nodes (true, dump_file);
+    }

 
   if ((flags & TODO_dump_cgraph)
       && dump_file && !current_function_decl)
     {
 
   if ((flags & TODO_dump_cgraph)
       && dump_file && !current_function_decl)
     {

+      gcc_assert (!cfun);

       dump_cgraph (dump_file);
       /* Flush the file.  If verification fails, we won't be able to
         close the file before aborting.  */
       dump_cgraph (dump_file);
       /* Flush the file.  If verification fails, we won't be able to
         close the file before aborting.  */


@@ -927,6 +1057,22 @@ execute_todo (unsigned int flags)
     {
       ggc_collect ();
     }
     {
       ggc_collect ();
     }

+
+  /* Now that the dumping has been done, we can get rid of the optional 
+     df problems.  */
+  if (flags & TODO_df_finish)
+    df_finish_pass ((flags & TODO_df_verify) != 0);
+}
+
+/* Verify invariants that should hold between passes.  This is a place
+   to put simple sanity checks.  */
+
+static void
+verify_interpass_invariants (void)
+{
+#ifdef ENABLE_CHECKING
+  gcc_assert (!fold_deferring_overflow_warnings_p ());
+#endif

 }
 
 /* Clear the last verified flag.  */
 }
 
 /* Clear the last verified flag.  */


@@ -949,22 +1095,167 @@ verify_curr_properties (void *data)
 }
 #endif
 
 }
 #endif
 

+/* Initialize pass dump file.  */
+
+static bool
+pass_init_dump_file (struct opt_pass *pass)
+{
+  /* If a dump file name is present, open it if enabled.  */
+  if (pass->static_pass_number != -1)
+    {
+      bool initializing_dump = !dump_initialized_p (pass->static_pass_number);
+      dump_file_name = get_dump_file_name (pass->static_pass_number);
+      dump_file = dump_begin (pass->static_pass_number, &dump_flags);
+      if (dump_file && current_function_decl)
+       {
+         const char *dname, *aname;
+         dname = lang_hooks.decl_printable_name (current_function_decl, 2);
+         aname = (IDENTIFIER_POINTER
+                  (DECL_ASSEMBLER_NAME (current_function_decl)));
+         fprintf (dump_file, "\n;; Function %s (%s)%s\n\n", dname, aname,
+            cfun->function_frequency == FUNCTION_FREQUENCY_HOT
+            ? " (hot)"
+            : cfun->function_frequency == FUNCTION_FREQUENCY_UNLIKELY_EXECUTED
+            ? " (unlikely executed)"
+            : "");
+       }
+      return initializing_dump;
+    }
+  else
+    return false;
+}
+
+/* Flush PASS dump file.  */
+
+static void
+pass_fini_dump_file (struct opt_pass *pass)
+{
+  /* Flush and close dump file.  */
+  if (dump_file_name)
+    {
+      free (CONST_CAST (char *, dump_file_name));
+      dump_file_name = NULL;
+    }
+
+  if (dump_file)
+    {
+      dump_end (pass->static_pass_number, dump_file);
+      dump_file = NULL;
+    }
+}
+

 /* After executing the pass, apply expected changes to the function
    properties. */
 /* After executing the pass, apply expected changes to the function
    properties. */

+

 static void
 update_properties_after_pass (void *data)
 {
 static void
 update_properties_after_pass (void *data)
 {

-  struct tree_opt_pass *pass = data;
+  struct opt_pass *pass = (struct opt_pass *) data;

   cfun->curr_properties = (cfun->curr_properties | pass->properties_provided)
                           & ~pass->properties_destroyed;
 }
 
   cfun->curr_properties = (cfun->curr_properties | pass->properties_provided)
                           & ~pass->properties_destroyed;
 }
 

+/* Schedule IPA transform pass DATA for CFUN.  */
+
+static void
+add_ipa_transform_pass (void *data)
+{
+  struct ipa_opt_pass *ipa_pass = (struct ipa_opt_pass *) data;
+  VEC_safe_push (ipa_opt_pass, heap, cfun->ipa_transforms_to_apply, ipa_pass);
+}
+
+/* Execute summary generation for all of the passes in IPA_PASS.  */
+
+static void
+execute_ipa_summary_passes (struct ipa_opt_pass *ipa_pass)
+{
+  while (ipa_pass)
+    {
+      struct opt_pass *pass = &ipa_pass->pass;
+
+      /* Execute all of the IPA_PASSes in the list.  */
+      if (ipa_pass->pass.type == IPA_PASS 
+         && (!pass->gate || pass->gate ()))
+       {
+         pass_init_dump_file (pass);
+         ipa_pass->generate_summary ();
+         pass_fini_dump_file (pass);
+       }
+      ipa_pass = (struct ipa_opt_pass *)ipa_pass->pass.next;
+    }
+}
+
+/* Execute IPA_PASS function transform on NODE.  */
+
+static void
+execute_one_ipa_transform_pass (struct cgraph_node *node,
+                               struct ipa_opt_pass *ipa_pass)
+{
+  struct opt_pass *pass = &ipa_pass->pass;
+  unsigned int todo_after = 0;
+
+  current_pass = pass;
+  if (!ipa_pass->function_transform)
+    return;
+
+  /* Note that the folders should only create gimple expressions.
+     This is a hack until the new folder is ready.  */
+  in_gimple_form = (cfun && (cfun->curr_properties & PROP_trees)) != 0;
+
+  pass_init_dump_file (pass);
+
+  /* Run pre-pass verification.  */
+  execute_todo (ipa_pass->function_transform_todo_flags_start);
+
+  /* If a timevar is present, start it.  */
+  if (pass->tv_id)
+    timevar_push (pass->tv_id);
+
+  /* Do it!  */
+  todo_after = ipa_pass->function_transform (node);
+
+  /* Stop timevar.  */
+  if (pass->tv_id)
+    timevar_pop (pass->tv_id);
+
+  /* Run post-pass cleanup and verification.  */
+  execute_todo (todo_after);
+  verify_interpass_invariants ();
+
+  pass_fini_dump_file (pass);
+
+  current_pass = NULL;
+}
+

 static bool
 static bool

-execute_one_pass (struct tree_opt_pass *pass)
+execute_one_pass (struct opt_pass *pass)

 {
   bool initializing_dump;
   unsigned int todo_after = 0;
 
 {
   bool initializing_dump;
   unsigned int todo_after = 0;
 

+  /* IPA passes are executed on whole program, so cfun should be NULL.
+     Other passes need function context set.  */
+  if (pass->type == SIMPLE_IPA_PASS || pass->type == IPA_PASS)
+    gcc_assert (!cfun && !current_function_decl);
+  else
+    gcc_assert (cfun && current_function_decl);
+
+  if (cfun && cfun->ipa_transforms_to_apply)
+    {
+      unsigned int i;
+      struct cgraph_node *node = cgraph_node (current_function_decl);
+
+      for (i = 0; i < VEC_length (ipa_opt_pass, cfun->ipa_transforms_to_apply);
+          i++)
+       execute_one_ipa_transform_pass (node,
+                                       VEC_index (ipa_opt_pass,
+                                                  cfun->ipa_transforms_to_apply,
+                                                  i));
+      VEC_free (ipa_opt_pass, heap, cfun->ipa_transforms_to_apply);
+      cfun->ipa_transforms_to_apply = NULL;
+    }
+
+  current_pass = pass;

   /* See if we're supposed to run this pass.  */
   if (pass->gate && !pass->gate ())
     return false;
   /* See if we're supposed to run this pass.  */
   if (pass->gate && !pass->gate ())
     return false;


@@ -987,28 +1278,7 @@ execute_one_pass (struct tree_opt_pass *pass)
                   (void *)(size_t)pass->properties_required);
 #endif
 
                   (void *)(size_t)pass->properties_required);
 #endif
 

-  /* If a dump file name is present, open it if enabled.  */
-  if (pass->static_pass_number != -1)
-    {
-      initializing_dump = !dump_initialized_p (pass->static_pass_number);
-      dump_file_name = get_dump_file_name (pass->static_pass_number);
-      dump_file = dump_begin (pass->static_pass_number, &dump_flags);
-      if (dump_file && current_function_decl)
-       {
-         const char *dname, *aname;
-         dname = lang_hooks.decl_printable_name (current_function_decl, 2);
-         aname = (IDENTIFIER_POINTER
-                  (DECL_ASSEMBLER_NAME (current_function_decl)));
-         fprintf (dump_file, "\n;; Function %s (%s)%s\n\n", dname, aname,
-            cfun->function_frequency == FUNCTION_FREQUENCY_HOT
-            ? " (hot)"
-            : cfun->function_frequency == FUNCTION_FREQUENCY_UNLIKELY_EXECUTED
-            ? " (unlikely executed)"
-            : "");
-       }
-    }
-  else
-    initializing_dump = false;
+  initializing_dump = pass_init_dump_file (pass);

 
   /* If a timevar is present, start it.  */
   if (pass->tv_id)
 
   /* If a timevar is present, start it.  */
   if (pass->tv_id)


@@ -1040,34 +1310,31 @@ execute_one_pass (struct tree_opt_pass *pass)
 
   /* Run post-pass cleanup and verification.  */
   execute_todo (todo_after | pass->todo_flags_finish);
 
   /* Run post-pass cleanup and verification.  */
   execute_todo (todo_after | pass->todo_flags_finish);

+  verify_interpass_invariants ();
+  if (pass->type == IPA_PASS)
+    do_per_function (add_ipa_transform_pass, pass);

 
   if (!current_function_decl)
     cgraph_process_new_functions ();
 
 
   if (!current_function_decl)
     cgraph_process_new_functions ();
 

-  /* Flush and close dump file.  */
-  if (dump_file_name)
-    {
-      free ((char *) dump_file_name);
-      dump_file_name = NULL;
-    }
+  pass_fini_dump_file (pass);

 
 

-  if (dump_file)
-    {
-      dump_end (pass->static_pass_number, dump_file);
-      dump_file = NULL;
-    }
+  if (pass->type != SIMPLE_IPA_PASS && pass->type != IPA_PASS)
+    gcc_assert (!(cfun->curr_properties & PROP_trees)
+               || pass->type != RTL_PASS);

 
 

-  /* Reset in_gimple_form to not break non-unit-at-a-time mode.  */
-  in_gimple_form = false;
+  current_pass = NULL;

 
   return true;
 }
 
 void
 
   return true;
 }
 
 void

-execute_pass_list (struct tree_opt_pass *pass)
+execute_pass_list (struct opt_pass *pass)

 {
   do
     {
 {
   do
     {

+      gcc_assert (pass->type == GIMPLE_PASS
+                 || pass->type == RTL_PASS);

       if (execute_one_pass (pass) && pass->sub)
         execute_pass_list (pass->sub);
       pass = pass->next;
       if (execute_one_pass (pass) && pass->sub)
         execute_pass_list (pass->sub);
       pass = pass->next;


@@ -1078,19 +1345,40 @@ execute_pass_list (struct tree_opt_pass *pass)
 /* Same as execute_pass_list but assume that subpasses of IPA passes
    are local passes.  */
 void
 /* Same as execute_pass_list but assume that subpasses of IPA passes
    are local passes.  */
 void

-execute_ipa_pass_list (struct tree_opt_pass *pass)
+execute_ipa_pass_list (struct opt_pass *pass)

 {
 {

+  bool summaries_generated = false;

   do
     {
       gcc_assert (!current_function_decl);
       gcc_assert (!cfun);
   do
     {
       gcc_assert (!current_function_decl);
       gcc_assert (!cfun);

+      gcc_assert (pass->type == SIMPLE_IPA_PASS || pass->type == IPA_PASS);
+      if (pass->type == IPA_PASS && (!pass->gate || pass->gate ()))
+       {
+         if (!summaries_generated)
+           {
+             if (!quiet_flag && !cfun)
+               fprintf (stderr, " <summary generate>");
+             execute_ipa_summary_passes ((struct ipa_opt_pass *) pass);
+           }
+         summaries_generated = true;
+       }

       if (execute_one_pass (pass) && pass->sub)
       if (execute_one_pass (pass) && pass->sub)

-       do_per_function_toporder ((void (*)(void *))execute_pass_list,
-                                 pass->sub);
+       {
+         if (pass->sub->type == GIMPLE_PASS)
+           do_per_function_toporder ((void (*)(void *))execute_pass_list,
+                                     pass->sub);
+         else if (pass->sub->type == SIMPLE_IPA_PASS
+                  || pass->sub->type == IPA_PASS)
+           execute_ipa_pass_list (pass->sub);
+         else
+           gcc_unreachable ();
+       }

       if (!current_function_decl)
        cgraph_process_new_functions ();
       pass = pass->next;
     }
   while (pass);
 }
       if (!current_function_decl)
        cgraph_process_new_functions ();
       pass = pass->next;
     }
   while (pass);
 }

+

 #include "gt-passes.h"
 #include "gt-passes.h"