From 2bc2379be5c98d34ecbb347b2abf059aa6d94499 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Mon, 4 Nov 2019 20:39:52 +0100 Subject: [PATCH] ipa-inline-transform.c: Include ipa-utils.h * ipa-inline-transform.c: Include ipa-utils.h (inline_call): Set thunk_expansion flag. * ipa-utils.h (thunk_expansion): Declare. * ipa-devirt.c (thunk_expansion): New global var. (devirt_node_removal_hook): Do not invalidate cache while doing thunk expansion. From-SVN: r277789 --- gcc/ChangeLog | 9 +++++++++ gcc/ipa-devirt.c | 6 ++++++ gcc/ipa-inline-transform.c | 3 +++ gcc/ipa-utils.h | 4 ++++ 4 files changed, 22 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f29939a0dd8..6d90105c8c3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2019-11-04 Jan Hubicka + + * ipa-inline-transform.c: Include ipa-utils.h + (inline_call): Set thunk_expansion flag. + * ipa-utils.h (thunk_expansion): Declare. + * ipa-devirt.c (thunk_expansion): New global var. + (devirt_node_removal_hook): Do not invalidate cache while + doing thunk expansion. + 2019-11-04 Tamar Christina * tree-vect-slp.c (vectorize_slp_instance_root_stmt): Initialize rstmt. diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index a14e7953788..4a73ba1aa76 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -172,6 +172,11 @@ struct default_hash_traits } }; +/* HACK alert: this is used to communicate with ipa-inline-transform that + thunk is being expanded and there is no need to clear the polymorphic + call target cache. */ +bool thunk_expansion; + static bool odr_types_equivalent_p (tree, tree, bool, bool *, hash_set *, location_t, location_t); @@ -2747,6 +2752,7 @@ static void devirt_node_removal_hook (struct cgraph_node *n, void *d ATTRIBUTE_UNUSED) { if (cached_polymorphic_call_targets + && !thunk_expansion && cached_polymorphic_call_targets->contains (n)) free_polymorphic_call_targets_hash (); } diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c index 1cc78034f19..8b9588982f3 100644 --- a/gcc/ipa-inline-transform.c +++ b/gcc/ipa-inline-transform.c @@ -47,6 +47,7 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "cfg.h" #include "basic-block.h" +#include "ipa-utils.h" int ncalls_inlined; int nfunctions_inlined; @@ -352,6 +353,7 @@ inline_call (struct cgraph_edge *e, bool update_original, if (to->thunk.thunk_p) { struct cgraph_node *target = to->callees->callee; + thunk_expansion = true; symtab->call_cgraph_removal_hooks (to); if (in_lto_p) to->get_untransformed_body (); @@ -360,6 +362,7 @@ inline_call (struct cgraph_edge *e, bool update_original, for (e = to->callees; e && e->callee != target; e = e->next_callee) ; symtab->call_cgraph_insertion_hooks (to); + thunk_expansion = false; gcc_assert (e); } diff --git a/gcc/ipa-utils.h b/gcc/ipa-utils.h index 22e6970234a..947307a3d66 100644 --- a/gcc/ipa-utils.h +++ b/gcc/ipa-utils.h @@ -47,6 +47,9 @@ void ipa_merge_profiles (struct cgraph_node *dst, struct cgraph_node *src, bool preserve_body = false); bool recursive_call_p (tree, tree); +/* In ipa-prop.c */ +void ipa_remove_useless_jump_functions (); + /* In ipa-profile.c */ bool ipa_propagate_frequency (struct cgraph_node *node); @@ -54,6 +57,7 @@ bool ipa_propagate_frequency (struct cgraph_node *node); struct odr_type_d; typedef odr_type_d *odr_type; +extern bool thunk_expansion; void build_type_inheritance_graph (void); void rebuild_type_inheritance_graph (void); void update_type_inheritance_graph (void); -- 2.30.2