diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-14 14:11:40 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-14 14:11:40 -0700 |
| commit | 421c53742610c053543f8c84e04d5e0c5185d68c (patch) | |
| tree | 8cd10900e452dc77f0637f9ee18f3e4347ea4b9f /compiler/elf_writer_mclinker.cc | |
| parent | d0916f36d27b643bca970f3645c38f44270c74ef (diff) | |
| download | art-421c53742610c053543f8c84e04d5e0c5185d68c.zip art-421c53742610c053543f8c84e04d5e0c5185d68c.tar.gz art-421c53742610c053543f8c84e04d5e0c5185d68c.tar.bz2 | |
Address comments from HandleScope change.
For:
https://android-review.googlesource.com/#/c/93793
Change-Id: I020d22a1508bf4f1770e6806d70e4fbb9a0fa0ab
Diffstat (limited to 'compiler/elf_writer_mclinker.cc')
| -rw-r--r-- | compiler/elf_writer_mclinker.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/elf_writer_mclinker.cc b/compiler/elf_writer_mclinker.cc index eb9b230..aa4a5b2 100644 --- a/compiler/elf_writer_mclinker.cc +++ b/compiler/elf_writer_mclinker.cc @@ -361,8 +361,9 @@ void ElfWriterMclinker::FixupOatMethodOffsets(const std::vector<const DexFile*>& ClassLinker* linker = Runtime::Current()->GetClassLinker(); // Unchecked as we hold mutator_lock_ on entry. ScopedObjectAccessUnchecked soa(Thread::Current()); - Handle<mirror::DexCache> dex_cache(soa.Self(), linker->FindDexCache(dex_file)); - Handle<mirror::ClassLoader> class_loader(soa.Self(), nullptr); + StackHandleScope<2> hs(soa.Self()); + Handle<mirror::DexCache> dex_cache(hs.NewHandle(linker->FindDexCache(dex_file))); + auto class_loader(hs.NewHandle<mirror::ClassLoader>(nullptr)); method = linker->ResolveMethod(dex_file, method_idx, dex_cache, class_loader, NULL, invoke_type); CHECK(method != NULL); } |