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 /compiler/oat_writer.cc | |
| 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 'compiler/oat_writer.cc')
| -rw-r--r-- | compiler/oat_writer.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index bace25c..5d532ab 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -513,9 +513,10 @@ class OatWriter::InitImageMethodVisitor : public OatDexMethodVisitor { ScopedObjectAccessUnchecked soa(Thread::Current()); StackHandleScope<2> hs(soa.Self()); Handle<mirror::DexCache> dex_cache(hs.NewHandle(linker->FindDexCache(*dex_file_))); - auto class_loader = hs.NewHandle<mirror::ClassLoader>(nullptr); mirror::ArtMethod* method = linker->ResolveMethod(*dex_file_, it.GetMemberIndex(), dex_cache, - class_loader, nullptr, invoke_type); + NullHandle<mirror::ClassLoader>(), + NullHandle<mirror::ArtMethod>(), + invoke_type); CHECK(method != NULL); // Portable code offsets are set by ElfWriterMclinker::FixupCompiledCodeOffset after linking. method->SetQuickOatCodeOffset(offsets.code_offset_); |