aboutsummaryrefslogtreecommitdiff
path: root/gcc/gimple-fold.c
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2014-07-29 11:36:36 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2014-07-29 09:36:36 +0000
commitf8a39967a57f8880b7050d53cbf888218626c493 (patch)
tree281f5b739d6f8a6c8ed7eeab2bbcfd90eb80502d /gcc/gimple-fold.c
parenteb5453a5902bc304efe2c97a360b947cd0424413 (diff)
downloadgcc-f8a39967a57f8880b7050d53cbf888218626c493.zip
gcc-f8a39967a57f8880b7050d53cbf888218626c493.tar.gz
gcc-f8a39967a57f8880b7050d53cbf888218626c493.tar.bz2
gimple-fold.c (fold_gimple_assign): Fix condition guarding ipa-devirt path; fix thinko there.
* gimple-fold.c (fold_gimple_assign): Fix condition guarding ipa-devirt path; fix thinko there. From-SVN: r213150
Diffstat (limited to 'gcc/gimple-fold.c')
-rw-r--r--gcc/gimple-fold.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 747c0aa..2e0f2bf 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -372,11 +372,11 @@ fold_gimple_assign (gimple_stmt_iterator *si)
tree val = OBJ_TYPE_REF_EXPR (rhs);
if (is_gimple_min_invariant (val))
return val;
- else if (flag_devirtualize && virtual_method_call_p (val))
+ else if (flag_devirtualize && virtual_method_call_p (rhs))
{
bool final;
vec <cgraph_node *>targets
- = possible_polymorphic_call_targets (val, stmt, &final);
+ = possible_polymorphic_call_targets (rhs, stmt, &final);
if (final && targets.length () <= 1 && dbg_cnt (devirt))
{
tree fndecl;
@@ -395,7 +395,8 @@ fold_gimple_assign (gimple_stmt_iterator *si)
? targets[0]->name ()
: "__builtin_unreachable");
}
- val = fold_convert (TREE_TYPE (val), fndecl);
+ val = fold_convert (TREE_TYPE (val),
+ build_fold_addr_expr_loc (loc, fndecl));
STRIP_USELESS_TYPE_CONVERSION (val);
return val;
}