diff options
Diffstat (limited to 'oatdump/oatdump.cc')
| -rw-r--r-- | oatdump/oatdump.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index fc60c028a1..fef25e0dd6 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -417,9 +417,10 @@ class OatDumper { Runtime* runtime = Runtime::Current(); if (runtime != nullptr) { ScopedObjectAccess soa(Thread::Current()); - SirtRef<mirror::DexCache> dex_cache( - soa.Self(), runtime->GetClassLinker()->FindDexCache(dex_file)); - SirtRef<mirror::ClassLoader> class_loader(soa.Self(), nullptr); + StackHandleScope<2> hs(soa.Self()); + Handle<mirror::DexCache> dex_cache( + hs.NewHandle(runtime->GetClassLinker()->FindDexCache(dex_file))); + auto class_loader(hs.NewHandle<mirror::ClassLoader>(nullptr)); verifier::MethodVerifier verifier(&dex_file, &dex_cache, &class_loader, &class_def, code_item, dex_method_idx, nullptr, method_access_flags, true, true); @@ -687,11 +688,12 @@ class OatDumper { uint32_t method_access_flags) { if ((method_access_flags & kAccNative) == 0) { ScopedObjectAccess soa(Thread::Current()); - SirtRef<mirror::DexCache> dex_cache( - soa.Self(), Runtime::Current()->GetClassLinker()->FindDexCache(*dex_file)); - SirtRef<mirror::ClassLoader> class_loader(soa.Self(), nullptr); + StackHandleScope<2> hs(soa.Self()); + Handle<mirror::DexCache> dex_cache( + hs.NewHandle(Runtime::Current()->GetClassLinker()->FindDexCache(*dex_file))); + auto class_loader(hs.NewHandle<mirror::ClassLoader>(nullptr)); verifier::MethodVerifier::VerifyMethodAndDump(os, dex_method_idx, dex_file, dex_cache, - class_loader, &class_def, code_item, NULL, + class_loader, &class_def, code_item, nullptr, method_access_flags); } } |