OSDN Git Service

fortran/
[pf3gnuchains/gcc-fork.git] / gcc / tree-optimize.c
index 329c06e..50dd22b 100644 (file)
@@ -16,8 +16,8 @@ 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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include "system.h"
@@ -51,13 +51,6 @@ Boston, MA 02111-1307, USA.  */
 #include "except.h"
 
 
-/* Global variables used to communicate with passes.  */
-int dump_flags;
-bool in_gimple_form;
-
-/* The root of the compilation pass tree, once constructed.  */
-static struct tree_opt_pass *all_passes, *all_ipa_passes, * all_lowering_passes;
-
 /* Gate: execute, or not, all of the non-trivial optimizations.  */
 
 static bool
@@ -68,7 +61,24 @@ gate_all_optimizations (void)
          && !(errorcount || sorrycount));
 }
 
-static struct tree_opt_pass pass_all_optimizations =
+struct tree_opt_pass pass_all_optimizations =
+{
+  NULL,                                        /* name */
+  gate_all_optimizations,              /* gate */
+  NULL,                                        /* 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 */
+  0                                    /* letter */
+};
+
+struct tree_opt_pass pass_early_local_passes =
 {
   NULL,                                        /* name */
   gate_all_optimizations,              /* gate */
@@ -90,15 +100,47 @@ static struct tree_opt_pass pass_all_optimizations =
    because after the tree optimizers have run such cleanups may
    be necessary.  */
 
-static void 
+static unsigned int
+execute_cleanup_cfg_pre_ipa (void)
+{
+  cleanup_tree_cfg ();
+  return 0;
+}
+
+struct tree_opt_pass pass_cleanup_cfg =
+{
+  "cleanup_cfg",                       /* name */
+  NULL,                                        /* gate */
+  execute_cleanup_cfg_pre_ipa,         /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  0,                                   /* tv_id */
+  PROP_cfg,                            /* properties_required */
+  0,                                   /* properties_provided */
+  0,                                   /* properties_destroyed */
+  0,                                   /* todo_flags_start */
+  TODO_dump_func,                                      /* todo_flags_finish */
+  0                                    /* letter */
+};
+
+
+/* Pass: cleanup the CFG just before expanding trees to RTL.
+   This is just a round of label cleanups and case node grouping
+   because after the tree optimizers have run such cleanups may
+   be necessary.  */
+
+static unsigned int
 execute_cleanup_cfg_post_optimizing (void)
 {
+  fold_cond_expr_cond ();
   cleanup_tree_cfg ();
   cleanup_dead_labels ();
   group_case_labels ();
+  return 0;
 }
 
-static struct tree_opt_pass pass_cleanup_cfg_post_optimizing =
+struct tree_opt_pass pass_cleanup_cfg_post_optimizing =
 {
   "final_cleanup",                     /* name */
   NULL,                                        /* gate */
@@ -118,35 +160,72 @@ static struct tree_opt_pass pass_cleanup_cfg_post_optimizing =
 /* Pass: do the actions required to finish with tree-ssa optimization
    passes.  */
 
-static void
+static unsigned int
 execute_free_datastructures (void)
 {
-  tree *chain;
-
   /* ??? This isn't the right place for this.  Worse, it got computed
      more or less at random in various passes.  */
   free_dominance_info (CDI_DOMINATORS);
-
-  /* Emit gotos for implicit jumps.  */
-  disband_implicit_edges ();
+  free_dominance_info (CDI_POST_DOMINATORS);
 
   /* Remove the ssa structures.  Do it here since this includes statement
      annotations that need to be intact during disband_implicit_edges.  */
   delete_tree_ssa ();
+  return 0;
+}
 
-  /* Re-chain the statements from the blocks.  */
-  chain = &DECL_SAVED_TREE (current_function_decl);
-  *chain = alloc_stmt_list ();
+struct tree_opt_pass pass_free_datastructures =
+{
+  NULL,                                        /* name */
+  NULL,                                        /* gate */
+  execute_free_datastructures,                 /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  0,                                   /* tv_id */
+  PROP_cfg,                            /* properties_required */
+  0,                                   /* properties_provided */
+  0,                                   /* properties_destroyed */
+  0,                                   /* todo_flags_start */
+  0,                                   /* todo_flags_finish */
+  0                                    /* letter */
+};
+/* Pass: free cfg annotations.  */
+
+static unsigned int
+execute_free_cfg_annotations (void)
+{
+  basic_block bb;
+  block_stmt_iterator bsi;
+
+  /* Emit gotos for implicit jumps.  */
+  disband_implicit_edges ();
+
+  /* Remove annotations from every tree in the function.  */
+  FOR_EACH_BB (bb)
+    for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
+      {
+       tree stmt = bsi_stmt (bsi);
+       ggc_free (stmt->common.ann);
+       stmt->common.ann = NULL;
+      }
 
   /* And get rid of annotations we no longer need.  */
   delete_tree_cfg_annotations ();
+
+#ifdef ENABLE_CHECKING
+  /* Once the statement annotations have been removed, we can verify
+     the integrity of statements in the EH throw table.  */
+  verify_eh_throw_table_statements ();
+#endif
+  return 0;
 }
 
-static struct tree_opt_pass pass_free_datastructures =
+struct tree_opt_pass pass_free_cfg_annotations =
 {
   NULL,                                        /* name */
   NULL,                                        /* gate */
-  execute_free_datastructures,                 /* execute */
+  execute_free_cfg_annotations,                /* execute */
   NULL,                                        /* sub */
   NULL,                                        /* next */
   0,                                   /* static_pass_number */
@@ -159,11 +238,27 @@ static struct tree_opt_pass pass_free_datastructures =
   0                                    /* letter */
 };
 
-/* Pass: fixup_cfg - IPA passes or compilation of earlier functions might've
-   changed some properties - such as marged functions nothrow.  Remove now
-   redundant edges and basic blocks.  */
+/* Return true if BB has at least one abnormal outgoing edge.  */
 
-static void
+static inline bool
+has_abnormal_outgoing_edge_p (basic_block bb)
+{
+  edge e;
+  edge_iterator ei;
+
+  FOR_EACH_EDGE (e, ei, bb->succs)
+    if (e->flags & EDGE_ABNORMAL)
+      return true;
+
+  return false;
+}
+
+/* Pass: fixup_cfg.  IPA passes, compilation of earlier functions or inlining
+   might have changed some properties, such as marked functions nothrow or
+   added calls that can potentially go to non-local labels.  Remove redundant
+   edges and basic blocks, and create new ones if necessary.  */
+
+static unsigned int
 execute_fixup_cfg (void)
 {
   basic_block bb;
@@ -184,13 +279,43 @@ execute_fixup_cfg (void)
          }
        tree_purge_dead_eh_edges (bb);
       }
-    
+
+  if (current_function_has_nonlocal_label)
+    FOR_EACH_BB (bb)
+      {
+       for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
+         {
+           tree stmt = bsi_stmt (bsi);
+           if (tree_can_make_abnormal_goto (stmt))
+             {
+               if (stmt == bsi_stmt (bsi_last (bb)))
+                 {
+                   if (!has_abnormal_outgoing_edge_p (bb))
+                     make_abnormal_goto_edges (bb, true);
+                 }
+               else
+                 {
+                   edge e = split_block (bb, stmt);
+                   bb = e->src;
+                   make_abnormal_goto_edges (bb, true);
+                 }
+               break;
+             }
+         }
+      }
+
   cleanup_tree_cfg ();
+
+  /* Dump a textual representation of the flowgraph.  */
+  if (dump_file)
+    dump_tree_cfg (dump_file, dump_flags);
+
+  return 0;
 }
 
-static struct tree_opt_pass pass_fixup_cfg =
+struct tree_opt_pass pass_fixup_cfg =
 {
-  NULL,                                        /* name */
+  "fixupcfg",                          /* name */
   NULL,                                        /* gate */
   execute_fixup_cfg,                   /* execute */
   NULL,                                        /* sub */
@@ -208,14 +333,15 @@ static struct tree_opt_pass pass_fixup_cfg =
 /* Do the actions required to initialize internal data structures used
    in tree-ssa optimization passes.  */
 
-static void
+static unsigned int
 execute_init_datastructures (void)
 {
   /* Allocate hash tables, arrays and other structures.  */
   init_tree_ssa ();
+  return 0;
 }
 
-static struct tree_opt_pass pass_init_datastructures =
+struct tree_opt_pass pass_init_datastructures =
 {
   NULL,                                        /* name */
   NULL,                                        /* gate */
@@ -232,434 +358,6 @@ static struct tree_opt_pass pass_init_datastructures =
   0                                    /* letter */
 };
 
-/* 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 n)
-{
-  char *dot_name, *flag_name, *glob_name;
-  char num[10];
-
-  /* See below in next_pass_1.  */
-  num[0] = '\0';
-  if (pass->static_pass_number != -1)
-    sprintf (num, "%d", ((int) pass->static_pass_number < 0
-                        ? 1 : pass->static_pass_number));
-
-  dot_name = concat (".", pass->name, num, NULL);
-  if (ipa)
-    {
-      flag_name = concat ("ipa-", pass->name, num, NULL);
-      glob_name = concat ("ipa-", pass->name, NULL);
-      /* First IPA dump is cgraph that is dumped via separate channels.  */
-      pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
-                                                TDF_IPA, n + 1, 0);
-    }
-  else if (pass->properties_provided & PROP_trees)
-    {
-      flag_name = concat ("tree-", pass->name, num, NULL);
-      glob_name = concat ("tree-", pass->name, NULL);
-      pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
-                                                TDF_TREE, n + TDI_tree_all, 0);
-    }
-  else
-    {
-      flag_name = concat ("rtl-", pass->name, num, NULL);
-      glob_name = concat ("rtl-", pass->name, NULL);
-      pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
-                                                TDF_RTL, n, pass->letter);
-    }
-}
-
-static int 
-register_dump_files (struct tree_opt_pass *pass, bool ipa, int properties)
-{
-  static int n = 0;
-  do
-    {
-      int new_properties;
-      int pass_number;
-
-      pass->properties_required = properties;
-      new_properties =
-        (properties | pass->properties_provided) & ~pass->properties_destroyed;
-
-      /* Reset the counter when we reach RTL-based passes.  */
-      if ((pass->properties_provided ^ pass->properties_required) & PROP_rtl)
-        n = 0;
-
-      pass_number = n;
-      if (pass->name)
-        n++;
-
-      if (pass->sub)
-        new_properties = register_dump_files (pass->sub, ipa, new_properties);
-
-      /* If we have a gate, combine the properties that we could have with
-         and without the pass being examined.  */
-      if (pass->gate)
-        properties &= new_properties;
-      else
-        properties = new_properties;
-
-      pass->properties_provided = properties;
-      if (pass->name)
-        register_one_dump_file (pass, ipa, pass_number);
-
-      pass = pass->next;
-    }
-  while (pass);
-
-  return properties;
-}
-
-/* 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)
-{
-
-  /* A nonzero static_pass_number indicates that the
-     pass is already in the list.  */
-  if (pass->static_pass_number)
-    {
-      struct tree_opt_pass *new;
-
-      new = xmalloc (sizeof (*new));
-      memcpy (new, pass, sizeof (*new));
-
-      /* Indicate to register_dump_files that this pass has duplicates,
-         and so it should rename the dump file.  The first instance will
-         be -1, and be number of duplicates = -static_pass_number - 1.
-         Subsequent instances will be > 0 and just the duplicate number.  */
-      if (pass->name)
-        {
-          pass->static_pass_number -= 1;
-          new->static_pass_number = -pass->static_pass_number;
-       }
-      
-      *list = new;
-    }
-  else
-    {
-      pass->static_pass_number = -1;
-      *list = pass;
-    }  
-  
-  return &(*list)->next;
-          
-}
-
-/* Construct the pass tree.  */
-
-void
-init_tree_optimization_passes (void)
-{
-  struct tree_opt_pass **p;
-
-#define NEXT_PASS(PASS)  (p = next_pass_1 (p, &PASS))
-  /* Intraprocedural optimization passes.  */
-  p = &all_ipa_passes;
-  NEXT_PASS (pass_ipa_inline);
-  *p = NULL;
-
-  /* All passes needed to lower the function into shape optimizers can operate
-     on.  These passes are performed before interprocedural passes, unlike rest
-     of local passes (all_passes).  */
-  p = &all_lowering_passes;
-  NEXT_PASS (pass_remove_useless_stmts);
-  NEXT_PASS (pass_mudflap_1);
-  NEXT_PASS (pass_lower_cf); 
-  NEXT_PASS (pass_lower_eh); 
-  NEXT_PASS (pass_build_cfg); 
-  NEXT_PASS (pass_pre_expand);
-  NEXT_PASS (pass_warn_function_return);
-  *p = NULL;
-
-  p = &all_passes;
-  NEXT_PASS (pass_fixup_cfg);
-  NEXT_PASS (pass_tree_profile);
-  NEXT_PASS (pass_init_datastructures);
-  NEXT_PASS (pass_all_optimizations);
-  NEXT_PASS (pass_warn_function_noreturn);
-  NEXT_PASS (pass_mudflap_2);
-  NEXT_PASS (pass_free_datastructures);
-  NEXT_PASS (pass_expand);
-  NEXT_PASS (pass_rest_of_compilation);
-  *p = NULL;
-
-  p = &pass_all_optimizations.sub;
-  NEXT_PASS (pass_referenced_vars);
-  NEXT_PASS (pass_create_structure_vars);
-  NEXT_PASS (pass_build_ssa);
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_rename_ssa_copies);
-  NEXT_PASS (pass_early_warn_uninitialized);
-
-  /* Initial scalar cleanups.  */
-  NEXT_PASS (pass_ccp);
-  NEXT_PASS (pass_fre);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_forwprop);
-  NEXT_PASS (pass_vrp);
-  NEXT_PASS (pass_copy_prop);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_merge_phi);
-  NEXT_PASS (pass_dominator);
-
-  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_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);
-  NEXT_PASS (pass_copy_prop);
-  NEXT_PASS (pass_dce);
-  NEXT_PASS (pass_dse);
-  NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_forwprop);
-  NEXT_PASS (pass_phiopt);
-  NEXT_PASS (pass_store_ccp);
-  NEXT_PASS (pass_store_copy_prop);
-  NEXT_PASS (pass_fold_builtins);
-  /* 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_cse_reciprocals);
-  NEXT_PASS (pass_split_crit_edges);
-  NEXT_PASS (pass_pre);
-  NEXT_PASS (pass_sink_code);
-  NEXT_PASS (pass_loop);
-  NEXT_PASS (pass_dominator);
-  NEXT_PASS (pass_copy_prop);
-  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_remove_useless_vars);
-  NEXT_PASS (pass_mark_used_blocks);
-  NEXT_PASS (pass_cleanup_cfg_post_optimizing);
-  *p = NULL;
-
-  p = &pass_loop.sub;
-  NEXT_PASS (pass_loop_init);
-  NEXT_PASS (pass_copy_prop);
-  NEXT_PASS (pass_lim);
-  NEXT_PASS (pass_unswitch);
-  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_lower_vector_ssa);
-  NEXT_PASS (pass_complete_unroll);
-  NEXT_PASS (pass_iv_optimize);
-  NEXT_PASS (pass_loop_done);
-  *p = NULL;
-
-#undef NEXT_PASS
-
-  register_dump_files (all_lowering_passes, false, 0);
-  register_dump_files (all_passes, false, PROP_gimple_any
-                                         | PROP_gimple_lcf
-                                         | PROP_gimple_leh
-                                         | PROP_cfg);
-  register_dump_files (all_ipa_passes, true, PROP_gimple_any
-                                            | PROP_gimple_lcf
-                                            | PROP_gimple_leh
-                                            | PROP_cfg);
-}
-
-static unsigned int last_verified;
-
-static void
-execute_todo (struct tree_opt_pass *pass, unsigned int flags, bool use_required)
-{
-  int properties 
-    = use_required ? pass->properties_required : pass->properties_provided;
-
-#if defined ENABLE_CHECKING
-  if (need_ssa_update_p ())
-    gcc_assert (flags & TODO_update_ssa_any);
-#endif
-
-  if (flags & TODO_update_ssa_any)
-    {
-      unsigned update_flags = flags & TODO_update_ssa_any;
-      update_ssa (update_flags);
-    }
-
-  if (flags & TODO_cleanup_cfg)
-    {
-      if (current_loops)
-       cleanup_tree_cfg_loop ();
-      else
-       cleanup_tree_cfg ();
-    }
-
-  if ((flags & TODO_dump_func)
-      && dump_file && current_function_decl)
-    {
-      if (properties & PROP_trees)
-        dump_function_to_file (current_function_decl,
-                               dump_file, dump_flags);
-      else if (properties & PROP_cfg)
-        print_rtl_with_bb (dump_file, get_insns ());
-      else
-        print_rtl (dump_file, get_insns ());
-
-      /* Flush the file.  If verification fails, we won't be able to
-        close the file before dieing.  */
-      fflush (dump_file);
-    }
-  if ((flags & TODO_dump_cgraph)
-      && dump_file && !current_function_decl)
-    {
-      dump_cgraph (dump_file);
-      /* Flush the file.  If verification fails, we won't be able to
-        close the file before aborting.  */
-      fflush (dump_file);
-    }
-
-  if (flags & TODO_ggc_collect)
-    {
-      ggc_collect ();
-    }
-
-#if defined ENABLE_CHECKING
-  if ((pass->properties_required & PROP_ssa)
-      && !(pass->properties_destroyed & PROP_ssa))
-    verify_ssa (true);
-  if (flags & TODO_verify_flow)
-    verify_flow_info ();
-  if (flags & TODO_verify_stmts)
-    verify_stmts ();
-  if (flags & TODO_verify_loops)
-    verify_loop_closed_ssa ();
-#endif
-}
-
-static bool
-execute_one_pass (struct tree_opt_pass *pass)
-{
-  unsigned int todo; 
-
-  /* See if we're supposed to run this pass.  */
-  if (pass->gate && !pass->gate ())
-    return false;
-
-  /* Note that the folders should only create gimple expressions.
-     This is a hack until the new folder is ready.  */
-  in_gimple_form = (pass->properties_provided & PROP_trees) != 0;
-
-  /* Run pre-pass verification.  */
-  todo = pass->todo_flags_start & ~last_verified;
-  if (todo)
-    execute_todo (pass, todo, true);
-
-  /* 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)"
-            : "");
-       }
-
-      if (initializing_dump
-          && graph_dump_format != no_graph
-         && (pass->properties_provided & (PROP_cfg | PROP_rtl))
-             == (PROP_cfg | PROP_rtl))
-        clean_graph_dump_file (dump_file_name);
-    }
-
-  /* If a timevar is present, start it.  */
-  if (pass->tv_id)
-    timevar_push (pass->tv_id);
-
-  /* Do it!  */
-  if (pass->execute)
-    pass->execute ();
-
-  /* Stop timevar.  */
-  if (pass->tv_id)
-    timevar_pop (pass->tv_id);
-
-  if (dump_file
-      && (pass->properties_provided & (PROP_cfg | PROP_rtl))
-         == (PROP_cfg | PROP_rtl))
-    print_rtl_with_bb (dump_file, get_insns ());
-
-  /* Run post-pass cleanup and verification.  */
-  todo = pass->todo_flags_finish;
-  last_verified = todo & TODO_verify_all;
-  if (todo)
-    execute_todo (pass, todo, false);
-
-  /* Flush and close dump file.  */
-  if (dump_file_name)
-    {
-      free ((char *) dump_file_name);
-      dump_file_name = NULL;
-    }
-  if (dump_file)
-    {
-      dump_end (pass->static_pass_number, dump_file);
-      dump_file = NULL;
-    }
-
-  return true;
-}
-
-static void
-execute_pass_list (struct tree_opt_pass *pass)
-{
-  do
-    {
-      if (execute_one_pass (pass) && pass->sub)
-       execute_pass_list (pass->sub);
-      pass = pass->next;
-    }
-  while (pass);
-}
-
 void
 tree_lowering_passes (tree fn)
 {
@@ -677,14 +375,6 @@ tree_lowering_passes (tree fn)
   pop_cfun ();
 }
 
-/* Execute all IPA passes.  */
-void
-ipa_passes (void)
-{
-   execute_pass_list (all_ipa_passes);
-}
-\f
-
 /* Update recursively all inlined_to pointers of functions
    inlined into NODE to INLINED_TO.  */
 static void
@@ -710,12 +400,19 @@ void
 tree_rest_of_compilation (tree fndecl)
 {
   location_t saved_loc;
-  struct cgraph_node *saved_node = NULL, *node;
+  struct cgraph_node *node;
 
   timevar_push (TV_EXPAND);
 
   gcc_assert (!flag_unit_at_a_time || cgraph_global_info_ready);
 
+  node = cgraph_node (fndecl);
+
+  /* We might need the body of this function so that we can expand
+     it inline somewhere else.  */
+  if (cgraph_preserve_function_body_p (fndecl))
+    save_inline_function_body (node);
+
   /* Initialize the RTL code for the function.  */
   current_function_decl = fndecl;
   saved_loc = input_location;
@@ -729,26 +426,6 @@ tree_rest_of_compilation (tree fndecl)
   cfun->x_dont_save_pending_sizes_p = 1;
   cfun->after_inlining = true;
 
-  node = cgraph_node (fndecl);
-
-  /* We might need the body of this function so that we can expand
-     it inline somewhere else.  This means not lowering some constructs
-     such as exception handling.  */
-  if (cgraph_preserve_function_body_p (fndecl))
-    {
-      if (!flag_unit_at_a_time)
-       {
-         struct cgraph_edge *e;
-
-         saved_node = cgraph_clone_node (node);
-         for (e = saved_node->callees; e; e = e->next_callee)
-           if (!e->inline_failed)
-             cgraph_clone_inlined_nodes (e, true);
-       }
-      cfun->saved_static_chain_decl = cfun->static_chain_decl;
-      save_body (fndecl, &cfun->saved_args, &cfun->saved_static_chain_decl);
-    }
-
   if (flag_inline_trees)
     {
       struct cgraph_edge *e;
@@ -762,15 +439,14 @@ tree_rest_of_compilation (tree fndecl)
          timevar_pop (TV_INTEGRATION);
        }
     }
-  /* We are not going to maintain the cgraph edges up to date.
-     Kill it so it won't confuse us.  */
-  while (node->callees)
+  /* In non-unit-at-a-time we must mark all referenced functions as needed.
+     */
+  if (!flag_unit_at_a_time)
     {
-      /* In non-unit-at-a-time we must mark all referenced functions as needed.
-         */
-      if (node->callees->callee->analyzed && !flag_unit_at_a_time)
-        cgraph_mark_needed_node (node->callees->callee);
-      cgraph_remove_edge (node->callees);
+      struct cgraph_edge *e;
+      for (e = node->callees; e; e = e->next_callee)
+       if (e->callee->analyzed)
+          cgraph_mark_needed_node (e->callee);
     }
 
   /* We are not going to maintain the cgraph edges up to date.
@@ -791,36 +467,7 @@ tree_rest_of_compilation (tree fndecl)
   /* Release the default bitmap obstack.  */
   bitmap_obstack_release (NULL);
   
-  /* Restore original body if still needed.  */
-  if (cfun->saved_cfg)
-    {
-      DECL_ARGUMENTS (fndecl) = cfun->saved_args;
-      cfun->cfg = cfun->saved_cfg;
-      cfun->eh = cfun->saved_eh;
-      cfun->saved_cfg = NULL;
-      cfun->saved_eh = NULL;
-      cfun->saved_args = NULL_TREE;
-      cfun->static_chain_decl = cfun->saved_static_chain_decl;
-      cfun->saved_static_chain_decl = NULL;
-      /* When not in unit-at-a-time mode, we must preserve out of line copy
-        representing node before inlining.  Restore original outgoing edges
-        using clone we created earlier.  */
-      if (!flag_unit_at_a_time)
-       {
-         struct cgraph_edge *e;
-
-         node = cgraph_node (current_function_decl);
-         cgraph_node_remove_callees (node);
-         node->callees = saved_node->callees;
-         saved_node->callees = NULL;
-         update_inlined_to_pointers (node, node);
-         for (e = node->callees; e; e = e->next_callee)
-           e->caller = node;
-         cgraph_remove_node (saved_node);
-       }
-    }
-  else
-    DECL_SAVED_TREE (fndecl) = NULL;
+  DECL_SAVED_TREE (fndecl) = NULL;
   cfun = 0;
 
   /* If requested, warn about function definitions where the function will
@@ -839,11 +486,11 @@ tree_rest_of_compilation (tree fndecl)
            = TREE_INT_CST_LOW (TYPE_SIZE_UNIT (ret_type));
 
          if (compare_tree_int (TYPE_SIZE_UNIT (ret_type), size_as_int) == 0)
-           warning (0, "%Jsize of return value of %qD is %u bytes",
-                     fndecl, fndecl, size_as_int);
+           warning (0, "size of return value of %q+D is %u bytes",
+                     fndecl, size_as_int);
          else
-           warning (0, "%Jsize of return value of %qD is larger than %wd bytes",
-                     fndecl, fndecl, larger_than_size);
+           warning (0, "size of return value of %q+D is larger than %wd bytes",
+                     fndecl, larger_than_size);
        }
     }