summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2014-11-19 09:07:47 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-11-19 09:07:47 +0000
commit17243343b0a5f56e75c1361f02ebaa340ba4334b (patch)
tree9cc014188747288d60e7f695bb2210861b563bbc /compiler/optimizing/optimizing_compiler.cc
parent255a5bde2f0014dc86a564555106a4291c0867b4 (diff)
parent4179cc148734fbda4677846369ae4a4db68677bf (diff)
Merge "Use cross-compilation helper."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 0de0907520..53273a4568 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -167,7 +167,8 @@ CompiledMethod* OptimizingCompiler::JniCompile(uint32_t access_flags,
}
uintptr_t OptimizingCompiler::GetEntryPointOf(mirror::ArtMethod* method) const {
- return reinterpret_cast<uintptr_t>(method->GetEntryPointFromQuickCompiledCode());
+ return reinterpret_cast<uintptr_t>(method->GetEntryPointFromQuickCompiledCodePtrSize(
+ InstructionSetPointerSize(GetCompilerDriver()->GetInstructionSet())));
}
bool OptimizingCompiler::WriteElf(art::File* file, OatWriter* oat_writer,