summaryrefslogtreecommitdiff
path: root/compiler/optimizing/inliner.cc
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-01-27 10:37:34 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-01-27 10:37:36 +0000
commitca21dc47adeed92a15a9d3fd090bdd0e6654679c (patch)
tree59aca3792abfa47c7424e4dac13248651e4662b2 /compiler/optimizing/inliner.cc
parent67c60656639acc92dca2ae8713add7d22683c7b9 (diff)
parente8fcd013493b800227bd7ea5f38f6cc27e9b90d1 (diff)
Merge "Revert "Revert "CHA for abstract methods."""
Diffstat (limited to 'compiler/optimizing/inliner.cc')
-rw-r--r--compiler/optimizing/inliner.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 5d40f75618..7772e8f973 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -304,7 +304,8 @@ ArtMethod* HInliner::TryCHADevirtualization(ArtMethod* resolved_method) {
// We do not support HDeoptimize in OSR methods.
return nullptr;
}
- return resolved_method->GetSingleImplementation();
+ PointerSize pointer_size = caller_compilation_unit_.GetClassLinker()->GetImagePointerSize();
+ return resolved_method->GetSingleImplementation(pointer_size);
}
bool HInliner::TryInline(HInvoke* invoke_instruction) {