summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2013-11-12 17:03:02 -0800
committer Mathieu Chartier <mathieuc@google.com> 2013-11-12 17:03:02 -0800
commit46bc778f1feed02b20d25e3d03470c93ca2c0506 (patch)
treeac760c321039cd8a5e78ae766accf4dc3ddb194b /compiler
parent0b74e3acc2fd35d95ac55c4ee2ffe5c651229ed8 (diff)
Fix portable + mips build.
Change-Id: Ia200e582b04c84973281e12331777351feb8a401
Diffstat (limited to 'compiler')
-rw-r--r--compiler/elf_writer_mclinker.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/elf_writer_mclinker.cc b/compiler/elf_writer_mclinker.cc
index 8e19ef6195..f3fef23247 100644
--- a/compiler/elf_writer_mclinker.cc
+++ b/compiler/elf_writer_mclinker.cc
@@ -358,10 +358,11 @@ void ElfWriterMclinker::FixupOatMethodOffsets(const std::vector<const DexFile*>&
mirror::ArtMethod* method = NULL;
if (compiler_driver_->IsImage()) {
ClassLinker* linker = Runtime::Current()->GetClassLinker();
- mirror::DexCache* dex_cache = linker->FindDexCache(dex_file);
// Unchecked as we hold mutator_lock_ on entry.
ScopedObjectAccessUnchecked soa(Thread::Current());
- method = linker->ResolveMethod(dex_file, method_idx, dex_cache, NULL, NULL, invoke_type);
+ SirtRef<mirror::DexCache> dex_cache(soa.Self(), linker->FindDexCache(dex_file));
+ SirtRef<mirror::ClassLoader> class_loader(soa.Self(), nullptr);
+ method = linker->ResolveMethod(dex_file, method_idx, dex_cache, class_loader, NULL, invoke_type);
CHECK(method != NULL);
}
const CompiledMethod* compiled_method =