From: Martin Liska Date: Wed, 4 Nov 2015 16:50:45 +0000 (+0100) Subject: Pass manager: add support for termination of pass list X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be373510f80fc6fc1e7b227056a69b703ce1c7a4;p=gcc.git Pass manager: add support for termination of pass list * cgraphunit.c (cgraph_node::expand_thunk): Call allocate_struct_function before init_function_start. (cgraph_node::expand): Use push_cfun and pop_cfun. * config/i386/i386.c (ix86_code_end): Call allocate_struct_function before init_function_start. * config/rs6000/rs6000.c (rs6000_code_end): Likewise. * function.c (init_function_start): Move preamble to all callers. * passes.c (do_per_function_toporder): Use push_cfun and pop_cfun. (execute_one_pass): Handle newly added TODO_discard_function. (execute_pass_list_1): Terminate if cfun equals to NULL. (execute_pass_list): Do not push and pop cfun, expect that cfun is set. * tree-pass.h (TODO_discard_function): Define. From-SVN: r229764 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b41693d306b..6e7020c1739 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2015-11-04 Martin Liska + + * cgraphunit.c (cgraph_node::expand_thunk): Call + allocate_struct_function before init_function_start. + (cgraph_node::expand): Use push_cfun and pop_cfun. + * config/i386/i386.c (ix86_code_end): Call + allocate_struct_function before init_function_start. + * config/rs6000/rs6000.c (rs6000_code_end): Likewise. + * function.c (init_function_start): Move preamble to all + callers. + * passes.c (do_per_function_toporder): Use push_cfun and pop_cfun. + (execute_one_pass): Handle newly added TODO_discard_function. + (execute_pass_list_1): Terminate if cfun equals to NULL. + (execute_pass_list): Do not push and pop cfun, expect that + cfun is set. + * tree-pass.h (TODO_discard_function): Define. + 2015-11-04 Mikhail Maltsev * cfganal.c (inverted_post_order_compute): Remove conditional diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 43d31858edd..f73d9a78e03 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -1618,6 +1618,7 @@ cgraph_node::expand_thunk (bool output_asm_thunks, bool force_gimple_thunk) fn_block = make_node (BLOCK); BLOCK_VARS (fn_block) = a; DECL_INITIAL (thunk_fndecl) = fn_block; + allocate_struct_function (thunk_fndecl, false); init_function_start (thunk_fndecl); cfun->is_thunk = 1; insn_locations_init (); @@ -1632,7 +1633,6 @@ cgraph_node::expand_thunk (bool output_asm_thunks, bool force_gimple_thunk) insn_locations_finalize (); init_insn_lengths (); free_after_compilation (cfun); - set_cfun (NULL); TREE_ASM_WRITTEN (thunk_fndecl) = 1; thunk.thunk_p = false; analyzed = false; @@ -1944,9 +1944,11 @@ cgraph_node::expand (void) bitmap_obstack_initialize (NULL); /* Initialize the RTL code for the function. */ - current_function_decl = decl; saved_loc = input_location; input_location = DECL_SOURCE_LOCATION (decl); + + gcc_assert (DECL_STRUCT_FUNCTION (decl)); + push_cfun (DECL_STRUCT_FUNCTION (decl)); init_function_start (decl); gimple_register_cfg_hooks (); @@ -2014,8 +2016,8 @@ cgraph_node::expand (void) /* Make sure that BE didn't give up on compiling. */ gcc_assert (TREE_ASM_WRITTEN (decl)); - set_cfun (NULL); - current_function_decl = NULL; + if (cfun) + pop_cfun (); /* It would make a lot more sense to output thunks before function body to get more forward and lest backwarding jumps. This however would need solving problem diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 66024e2d74a..2a965f678a0 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -10958,6 +10958,7 @@ ix86_code_end (void) DECL_INITIAL (decl) = make_node (BLOCK); current_function_decl = decl; + allocate_struct_function (decl, false); init_function_start (decl); first_function_block_is_cold = false; /* Make sure unwind info is emitted for the thunk if needed. */ diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 271c3f91b4a..8bdd64674bf 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -34594,6 +34594,7 @@ rs6000_code_end (void) DECL_INITIAL (decl) = make_node (BLOCK); current_function_decl = decl; + allocate_struct_function (decl, false); init_function_start (decl); first_function_block_is_cold = false; /* Make sure unwind info is emitted for the thunk if needed. */ diff --git a/gcc/function.c b/gcc/function.c index aaf49a4bbb9..0d7cabc1d4c 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4957,11 +4957,6 @@ init_dummy_function_start (void) void init_function_start (tree subr) { - if (subr && DECL_STRUCT_FUNCTION (subr)) - set_cfun (DECL_STRUCT_FUNCTION (subr)); - else - allocate_struct_function (subr, false); - /* Initialize backend, if needed. */ initialize_rtl (); diff --git a/gcc/passes.c b/gcc/passes.c index f87dcf4bb18..7a10cb6334c 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -1706,7 +1706,12 @@ do_per_function_toporder (void (*callback) (function *, void *data), void *data) order[i] = NULL; node->process = 0; if (node->has_gimple_body_p ()) - callback (DECL_STRUCT_FUNCTION (node->decl), data); + { + struct function *fn = DECL_STRUCT_FUNCTION (node->decl); + push_cfun (fn); + callback (fn, data); + pop_cfun (); + } } symtab->remove_cgraph_removal_hook (hook); } @@ -2347,6 +2352,23 @@ execute_one_pass (opt_pass *pass) current_pass = NULL; + if (todo_after & TODO_discard_function) + { + gcc_assert (cfun); + /* As cgraph_node::release_body expects release dominators info, + we have to release it. */ + if (dom_info_available_p (CDI_DOMINATORS)) + free_dominance_info (CDI_DOMINATORS); + + if (dom_info_available_p (CDI_POST_DOMINATORS)) + free_dominance_info (CDI_POST_DOMINATORS); + + tree fn = cfun->decl; + pop_cfun (); + gcc_assert (!cfun); + cgraph_node::get (fn)->release_body (); + } + /* Signal this is a suitable GC collection point. */ if (!((todo_after | pass->todo_flags_finish) & TODO_do_not_ggc_collect)) ggc_collect (); @@ -2361,6 +2383,9 @@ execute_pass_list_1 (opt_pass *pass) { gcc_assert (pass->type == GIMPLE_PASS || pass->type == RTL_PASS); + + if (cfun == NULL) + return; if (execute_one_pass (pass) && pass->sub) execute_pass_list_1 (pass->sub); pass = pass->next; @@ -2371,14 +2396,13 @@ execute_pass_list_1 (opt_pass *pass) void execute_pass_list (function *fn, opt_pass *pass) { - push_cfun (fn); + gcc_assert (fn == cfun); execute_pass_list_1 (pass); - if (fn->cfg) + if (cfun && fn->cfg) { free_dominance_info (CDI_DOMINATORS); free_dominance_info (CDI_POST_DOMINATORS); } - pop_cfun (); } /* Write out all LTO data. */ diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index ba53ccaabcd..49e22a9d091 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -300,6 +300,9 @@ protected: /* Rebuild the callgraph edges. */ #define TODO_rebuild_cgraph_edges (1 << 22) +/* Release function body and stop pass manager. */ +#define TODO_discard_function (1 << 23) + /* Internally used in execute_function_todo(). */ #define TODO_update_ssa_any \ (TODO_update_ssa \