diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-19 08:35:17 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-19 08:35:17 +0000 |
| commit | 4179cc148734fbda4677846369ae4a4db68677bf (patch) | |
| tree | 9cc014188747288d60e7f695bb2210861b563bbc /compiler/optimizing/optimizing_compiler.cc | |
| parent | 255a5bde2f0014dc86a564555106a4291c0867b4 (diff) | |
| download | android_art-4179cc148734fbda4677846369ae4a4db68677bf.tar.gz android_art-4179cc148734fbda4677846369ae4a4db68677bf.tar.bz2 android_art-4179cc148734fbda4677846369ae4a4db68677bf.zip | |
Use cross-compilation helper.
The default method uses the current pointer size. We should
use the pointer size given to the compiler.
Change-Id: I4d6bacad6c17ac715455cabfc89cc651368d07a5
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 3 |
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, |