From 4179cc148734fbda4677846369ae4a4db68677bf Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 19 Nov 2014 08:35:17 +0000 Subject: 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 --- compiler/optimizing/optimizing_compiler.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/optimizing/optimizing_compiler.cc') 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(method->GetEntryPointFromQuickCompiledCode()); + return reinterpret_cast(method->GetEntryPointFromQuickCompiledCodePtrSize( + InstructionSetPointerSize(GetCompilerDriver()->GetInstructionSet()))); } bool OptimizingCompiler::WriteElf(art::File* file, OatWriter* oat_writer, -- cgit v1.2.3-59-g8ed1b