diff options
Diffstat (limited to 'gcc/ipa-prop.c')
| -rw-r--r-- | gcc/ipa-prop.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 89a4623e0c2..dc8f3606b1e 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -2626,9 +2626,29 @@ ipa_make_edge_direct_to_target (struct cgraph_edge *ie, tree target, target = canonicalize_constructor_val (target, NULL); if (!target || TREE_CODE (target) != FUNCTION_DECL) { - if (ie->indirect_info->member_ptr) - /* Member pointer call that goes through a VMT lookup. */ - return NULL; + /* Member pointer call that goes through a VMT lookup. */ + if (ie->indirect_info->member_ptr + /* Or if target is not an invariant expression and we do not + know if it will evaulate to function at runtime. + This can happen when folding through &VAR, where &VAR + is IP invariant, but VAR itself is not. + + TODO: Revisit this when GCC 5 is branched. It seems that + member_ptr check is not needed and that we may try to fold + the expression and see if VAR is readonly. */ + || !is_gimple_ip_invariant (target)) + { + if (dump_enabled_p ()) + { + location_t loc = gimple_location_safe (ie->call_stmt); + dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, loc, + "discovered direct call non-invariant " + "%s/%i\n", + ie->caller->name (), ie->caller->order); + } + return NULL; + } + if (dump_enabled_p ()) { |