X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-optimize.c;h=b4bd069b6175ff15c2292e96159a9025a0ef51f0;hb=c6a0599243068b33768268296b067d0fce5feec9;hp=9e4af19bbad66a0865d9fa7e5f77f3cab32a6a24;hpb=35cc02b5c80ac6738c1a3362a822e3d7e4d0c587;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/tree-optimize.c b/gcc/tree-optimize.c index 9e4af19bbad..b4bd069b617 100644 --- a/gcc/tree-optimize.c +++ b/gcc/tree-optimize.c @@ -1,12 +1,12 @@ /* Top-level control of tree optimizations. - Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. Contributed by Diego Novillo 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) +the Free Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, @@ -15,9 +15,8 @@ MERCHANTABILITY or 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 -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 +. */ #include "config.h" #include "system.h" @@ -57,8 +56,9 @@ static bool gate_all_optimizations (void) { return (optimize >= 1 - /* Don't bother doing anything if the program has errors. */ - && !(errorcount || sorrycount)); + /* Don't bother doing anything if the program has errors. + We have to pass down the queue if we already went into SSA */ + && (!(errorcount || sorrycount) || gimple_in_ssa_p (cfun))); } struct tree_opt_pass pass_all_optimizations = @@ -78,10 +78,19 @@ struct tree_opt_pass pass_all_optimizations = 0 /* letter */ }; +/* Gate: execute, or not, all of the non-trivial optimizations. */ + +static bool +gate_all_early_local_passes (void) +{ + /* Don't bother doing anything if the program has errors. */ + return (!errorcount && !sorrycount); +} + struct tree_opt_pass pass_early_local_passes = { - NULL, /* name */ - gate_all_optimizations, /* gate */ + "early_local_cleanups", /* name */ + gate_all_early_local_passes, /* gate */ NULL, /* execute */ NULL, /* sub */ NULL, /* next */ @@ -91,6 +100,41 @@ struct tree_opt_pass pass_early_local_passes = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ + TODO_remove_functions, /* todo_flags_finish */ + 0 /* letter */ +}; + +static unsigned int +execute_early_local_optimizations (void) +{ + if (flag_unit_at_a_time) + cgraph_state = CGRAPH_STATE_IPA_SSA; + return 0; +} + +/* Gate: execute, or not, all of the non-trivial optimizations. */ + +static bool +gate_all_early_optimizations (void) +{ + return (optimize >= 1 + /* Don't bother doing anything if the program has errors. */ + && !(errorcount || sorrycount)); +} + +struct tree_opt_pass pass_all_early_optimizations = +{ + "early_optimizations", /* name */ + gate_all_early_optimizations, /* gate */ + execute_early_local_optimizations, /* 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 */ }; @@ -163,14 +207,12 @@ struct tree_opt_pass pass_cleanup_cfg_post_optimizing = static unsigned int execute_free_datastructures (void) { - /* ??? 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); 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 (); + /* Remove the ssa structures. */ + if (cfun->gimple_df) + delete_tree_ssa (); return 0; } @@ -195,29 +237,9 @@ struct tree_opt_pass pass_free_datastructures = 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->base.ann); - stmt->base.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; } @@ -238,31 +260,21 @@ struct tree_opt_pass pass_free_cfg_annotations = 0 /* letter */ }; -/* Return true if BB has at least one abnormal outgoing edge. */ - -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. */ + might have changed some properties, such as marked functions nothrow. + Remove redundant edges and basic blocks, and create new ones if necessary. -static unsigned int + This pass can't be executed as stand alone pass from pass manager, because + in between inlining and this fixup the verify_flow_info would fail. */ + +unsigned int execute_fixup_cfg (void) { basic_block bb; block_stmt_iterator bsi; + int todo = gimple_in_ssa_p (cfun) ? TODO_verify_ssa : 0; + + cfun->after_inlining = true; if (cfun->eh) FOR_EACH_BB (bb) @@ -271,65 +283,34 @@ execute_fixup_cfg (void) { tree stmt = bsi_stmt (bsi); tree call = get_call_expr_in (stmt); + tree decl = call ? get_callee_fndecl (call) : NULL; - if (call && call_expr_flags (call) & (ECF_CONST | ECF_PURE)) - TREE_SIDE_EFFECTS (call) = 0; - if (!tree_could_throw_p (stmt) && lookup_stmt_eh_region (stmt)) - remove_stmt_from_eh_region (stmt); - } - 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 (decl && call_expr_flags (call) & (ECF_CONST | ECF_PURE) + && TREE_SIDE_EFFECTS (call)) { - if (stmt == bsi_stmt (bsi_last (bb))) - { - if (!has_abnormal_outgoing_edge_p (bb)) - make_abnormal_goto_edges (bb, true); - } - else + if (gimple_in_ssa_p (cfun)) { - edge e = split_block (bb, stmt); - bb = e->src; - make_abnormal_goto_edges (bb, true); + todo |= TODO_update_ssa | TODO_cleanup_cfg; + update_stmt (stmt); } - break; + TREE_SIDE_EFFECTS (call) = 0; } + if (decl && TREE_NOTHROW (decl)) + TREE_NOTHROW (call) = 1; + if (!tree_could_throw_p (stmt) && lookup_stmt_eh_region (stmt)) + remove_stmt_from_eh_region (stmt); } + if (tree_purge_dead_eh_edges (bb)) + todo |= TODO_cleanup_cfg; } - cleanup_tree_cfg (); - /* Dump a textual representation of the flowgraph. */ if (dump_file) dump_tree_cfg (dump_file, dump_flags); - return 0; + return todo; } -struct tree_opt_pass pass_fixup_cfg = -{ - "fixupcfg", /* name */ - NULL, /* gate */ - execute_fixup_cfg, /* 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 */ -}; - /* Do the actions required to initialize internal data structures used in tree-ssa optimization passes. */ @@ -341,10 +322,18 @@ execute_init_datastructures (void) return 0; } +/* Gate: initialize or not the SSA datastructures. */ + +static bool +gate_init_datastructures (void) +{ + return (optimize >= 1); +} + struct tree_opt_pass pass_init_datastructures = { NULL, /* name */ - NULL, /* gate */ + gate_init_datastructures, /* gate */ execute_init_datastructures, /* execute */ NULL, /* sub */ NULL, /* next */ @@ -368,30 +357,15 @@ tree_lowering_passes (tree fn) tree_register_cfg_hooks (); bitmap_obstack_initialize (NULL); execute_pass_list (all_lowering_passes); + if (optimize && cgraph_global_info_ready) + execute_pass_list (pass_early_local_passes.sub); free_dominance_info (CDI_POST_DOMINATORS); + free_dominance_info (CDI_DOMINATORS); compact_blocks (); current_function_decl = saved_current_function_decl; bitmap_obstack_release (NULL); pop_cfun (); } - -/* Update recursively all inlined_to pointers of functions - inlined into NODE to INLINED_TO. */ -static void -update_inlined_to_pointers (struct cgraph_node *node, - struct cgraph_node *inlined_to) -{ - struct cgraph_edge *e; - for (e = node->callees; e; e = e->next_callee) - { - if (e->callee->global.inlined_to) - { - e->callee->global.inlined_to = inlined_to; - update_inlined_to_pointers (e->callee, inlined_to); - } - } -} - /* For functions-as-trees languages, this performs all optimization and compilation for FNDECL. */ @@ -408,13 +382,12 @@ tree_rest_of_compilation (tree fndecl) 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 default bitmap obstack. */ + bitmap_obstack_initialize (NULL); /* Initialize the RTL code for the function. */ current_function_decl = fndecl; + cfun = DECL_STRUCT_FUNCTION (fndecl); saved_loc = input_location; input_location = DECL_SOURCE_LOCATION (fndecl); init_function_start (fndecl); @@ -424,41 +397,10 @@ tree_rest_of_compilation (tree fndecl) We haven't necessarily assigned RTL to all variables yet, so it's not safe to try to expand expressions involving them. */ cfun->x_dont_save_pending_sizes_p = 1; - cfun->after_inlining = true; - - if (flag_inline_trees) - { - struct cgraph_edge *e; - for (e = node->callees; e; e = e->next_callee) - if (!e->inline_failed || warn_inline) - break; - if (e) - { - timevar_push (TV_INTEGRATION); - optimize_inline_calls (fndecl); - timevar_pop (TV_INTEGRATION); - } - } - /* In non-unit-at-a-time we must mark all referenced functions as needed. - */ - if (!flag_unit_at_a_time) - { - 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. - Kill it so it won't confuse us. */ - cgraph_node_remove_callees (node); - - - /* Initialize the default bitmap obstack. */ - bitmap_obstack_initialize (NULL); - bitmap_obstack_initialize (®_obstack); /* FIXME, only at RTL generation*/ tree_register_cfg_hooks (); + + bitmap_obstack_initialize (®_obstack); /* FIXME, only at RTL generation*/ /* Perform all tree transforms and optimizations. */ execute_pass_list (all_passes);