diff options
| author | Jan Hubicka <jh@suse.cz> | 2011-06-10 15:24:30 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2011-06-10 13:24:30 +0000 |
| commit | f1724940a99f1b841d066ccf050a16e11be12f46 (patch) | |
| tree | 5a3afdf91d3d3953bbd03b79c2e0d857d968bf70 /gcc/gimple-fold.c | |
| parent | a6f834c5a87c1ac42f1c842bba34d84740218d77 (diff) | |
| download | gcc-f1724940a99f1b841d066ccf050a16e11be12f46.zip gcc-f1724940a99f1b841d066ccf050a16e11be12f46.tar.gz gcc-f1724940a99f1b841d066ccf050a16e11be12f46.tar.bz2 | |
ipa-cp.c (ipcp_process_devirtualization_opportunities): Update call of gimple_get_virt_method_for_binfo.
* ipa-cp.c (ipcp_process_devirtualization_opportunities):
Update call of gimple_get_virt_method_for_binfo.
* gimple-fold.c (gimple_get_virt_method_for_binfo): Remove
refuse_thunks parameter.
(gimple_fold_call): Update.
* ipa-prop.c (try_make_edge_direct_virtual_call): Update.
From-SVN: r174905
Diffstat (limited to 'gcc/gimple-fold.c')
| -rw-r--r-- | gcc/gimple-fold.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 180a51e..6b3b275 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -1373,11 +1373,10 @@ gimple_fold_builtin (gimple stmt) tree gimple_get_virt_method_for_binfo (HOST_WIDE_INT token, tree known_binfo, - tree *delta, bool refuse_thunks) + tree *delta) { HOST_WIDE_INT i; tree v, fndecl; - struct cgraph_node *node; v = BINFO_VIRTUALS (known_binfo); /* If there is no virtual methods leave the OBJ_TYPE_REF alone. */ @@ -1396,18 +1395,6 @@ gimple_get_virt_method_for_binfo (HOST_WIDE_INT token, tree known_binfo, return NULL_TREE; fndecl = TREE_VALUE (v); - node = cgraph_get_node_or_alias (fndecl); - if (refuse_thunks - && (!node - /* Bail out if it is a thunk declaration. Since simple this_adjusting - thunks are represented by a constant in TREE_PURPOSE of items in - BINFO_VIRTUALS, this is a more complicate type which we cannot handle as - yet. - - FIXME: Remove the following condition once we are able to represent - thunk information on call graph edges. */ - || (node->same_body_alias && node->thunk.thunk_p))) - return NULL_TREE; /* When cgraph node is missing and function is not public, we cannot devirtualize. This can happen in WHOPR when the actual method @@ -1557,7 +1544,7 @@ gimple_fold_call (gimple_stmt_iterator *gsi, bool inplace) if (!binfo) return false; token = TREE_INT_CST_LOW (OBJ_TYPE_REF_TOKEN (callee)); - fndecl = gimple_get_virt_method_for_binfo (token, binfo, &delta, false); + fndecl = gimple_get_virt_method_for_binfo (token, binfo, &delta); if (!fndecl) return false; gcc_assert (integer_zerop (delta)); |