diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 16:48:55 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-23 12:55:45 -0700 |
| commit | 0cd81352a7c06e381951cea1b104fd73516f4341 (patch) | |
| tree | fcc8ff9cdeb608d0913097aa1fb64d1879f11ffa /oatdump | |
| parent | dfd301f19800a4f168283cf2d0b15b2c09071955 (diff) | |
| download | art-0cd81352a7c06e381951cea1b104fd73516f4341.zip art-0cd81352a7c06e381951cea1b104fd73516f4341.tar.gz art-0cd81352a7c06e381951cea1b104fd73516f4341.tar.bz2 | |
Revert "Revert "Fix an outstanding compaction bug in interpreter.""
Fixed the generic trampoline to not use ToJObject when unnecessary.
Bug: 15167269
This reverts commit 3bdb873122964da7937eb070cbcf2ef638a8e459.
Change-Id: I0525d0e0f3afb753c770e1572070a0fa22b02271
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index d38f37f..0ba3206 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -424,10 +424,10 @@ class OatDumper { Runtime* runtime = Runtime::Current(); if (runtime != nullptr) { ScopedObjectAccess soa(Thread::Current()); - StackHandleScope<2> hs(soa.Self()); + StackHandleScope<1> hs(soa.Self()); Handle<mirror::DexCache> dex_cache( hs.NewHandle(runtime->GetClassLinker()->FindDexCache(dex_file))); - auto class_loader(hs.NewHandle<mirror::ClassLoader>(nullptr)); + NullHandle<mirror::ClassLoader> class_loader; verifier::MethodVerifier verifier(&dex_file, &dex_cache, &class_loader, &class_def, code_item, dex_method_idx, nullptr, method_access_flags, true, true); |