From c47d00347d7e74193dda2e9a3f55f52485e7eeeb Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sat, 7 May 2011 01:00:49 +0200 Subject: cgraph.c (cgraph_add_thunk): Create real function node instead of alias node... * cgraph.c (cgraph_add_thunk): Create real function node instead of alias node; finalize it and mark needed/reachale; arrange visibility to be right and add it into the corresponding same comdat group list. (dump_cgraph_node): Dump thunks. * cgraph.h (cgraph_first_defined_function, cgraph_next_defined_function, cgraph_function_with_gimple_body_p, cgraph_first_function_with_gimple_body, cgraph_next_function_with_gimple_body): New functions. (FOR_EACH_FUNCTION_WITH_GIMPLE_BODY, FOR_EACH_DEFINED_FUNCTION): New macros. * ipa-cp.c (ipcp_need_redirect_p): Thunks can't be redirected. (ipcp_generate_summary): Use FOR_EACH_FUNCTION_WITH_GIMPLE_BODY. * cgraphunit.c (cgraph_finalize_function): Only look into possible devirtualization when optimizing. (verify_cgraph_node): Verify thunks. (cgraph_analyze_function): Analyze thunks. (cgraph_mark_functions_to_output): Output thunks only in combination with function they are assigned to. (assemble_thunk): Turn thunk into non-thunk; don't try to turn alias into normal node. (assemble_thunks): New functoin. (cgraph_expand_function): Use it. * lto-cgraph.c (lto_output_node): Stream thunks. (input_overwrite_node): Stream in thunks. * ipa-pure-const.c (analyze_function): Thunks do nothing interesting. * lto-streamer-out.c (lto_output): Do not try to output thunk's body. * ipa-inline.c (inline_small_functions): Use FOR_EACH_DEFINED_FUNCTION. * ipa-inline-analysis.c (compute_inline_parameters): "Analyze" thunks. (inline_analyze_function): Do not care about thunk jump functions. (inline_generate_summary):Use FOR_EACH_DEFINED_FUNCTION. * ipa-prop.c (ipa_prop_write_jump_functions): Use cgraph_function_with_gimple_body_p. * passes.c (do_per_function_toporder): Use cgraph_function_with_gimple_body_p. (execute_one_pass);Use FOR_EACH_FUNCTION_WITH_GIMPLE_BODY. (ipa_write_summaries): Use cgraph_function_with_gimple_body_p. (function_called_by_processed_nodes_p): Likewise. * lto.c (lto_materialize_function): Use cgraph_function_with_gimple_body_p. (add_cgraph_node_to_partition): Do not re-add items to partition; handle thunks. (add_varpool_node_to_partition): Do not re-add items to partition. From-SVN: r173517 --- gcc/lto/ChangeLog | 6 ++++++ gcc/lto/lto.c | 24 ++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) (limited to 'gcc/lto') diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index ca1bc6e..61558e3 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2011-05-07 Jan Hubicka + + * lto.c (lto_materialize_function): Use cgraph_function_with_gimple_body_p. + (add_cgraph_node_to_partition): Do not re-add items to partition; handle thunks. + (add_varpool_node_to_partition): Do not re-add items to partition. + 2011-05-03 Jan Hubicka * lto.c (free_ltrans_partitions): Fix accidental commit. diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index fdd1638..8344022 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -147,9 +147,9 @@ lto_materialize_function (struct cgraph_node *node) decl = node->decl; /* Read in functions with body (analyzed nodes) and also functions that are needed to produce virtual clones. */ - if (node->analyzed || has_analyzed_clone_p (node)) + if (cgraph_function_with_gimple_body_p (node) || has_analyzed_clone_p (node)) { - /* Clones don't need to be read. */ + /* Clones and thunks don't need to be read. */ if (node->clone_of) return; @@ -1197,6 +1197,12 @@ static void add_cgraph_node_to_partition (ltrans_partition part, struct cgraph_node *node) { struct cgraph_edge *e; + cgraph_node_set_iterator csi; + + /* If NODE is already there, we have nothing to do. */ + csi = cgraph_node_set_find (part->cgraph_set, node); + if (!csi_end_p (csi)) + return; part->insns += inline_summary (node)->self_size; @@ -1211,6 +1217,13 @@ add_cgraph_node_to_partition (ltrans_partition part, struct cgraph_node *node) cgraph_node_set_add (part->cgraph_set, node); + /* Thunks always must go along with function they reffer to. */ + if (node->thunk.thunk_p) + add_cgraph_node_to_partition (part, node->callees->callee); + for (e = node->callers; e; e = e->next_caller) + if (e->caller->thunk.thunk_p) + add_cgraph_node_to_partition (part, e->caller); + for (e = node->callees; e; e = e->next_callee) if ((!e->inline_failed || DECL_COMDAT (e->callee->decl)) && !cgraph_node_in_set_p (e->callee, part->cgraph_set)) @@ -1228,6 +1241,13 @@ add_cgraph_node_to_partition (ltrans_partition part, struct cgraph_node *node) static void add_varpool_node_to_partition (ltrans_partition part, struct varpool_node *vnode) { + varpool_node_set_iterator vsi; + + /* If NODE is already there, we have nothing to do. */ + vsi = varpool_node_set_find (part->varpool_set, vnode); + if (!vsi_end_p (vsi)) + return; + varpool_node_set_add (part->varpool_set, vnode); if (vnode->aux) -- cgit v1.1