commit 3bdb873122964da7937eb070cbcf2ef638a8e459
author Mathieu Chartier <mathieuc@google.com> Thu May 22 22:06:51 2014 +0000
committer Mathieu Chartier <mathieuc@google.com> Thu May 22 22:06:51 2014 +0000
tree 3d29123f33853e11adb67bdd6ac56f19ee798a1f
parent e09ae0920be57760fb390b6944bce420fa0b5582

Revert "Fix an outstanding compaction bug in interpreter."

This reverts commit e09ae0920be57760fb390b6944bce420fa0b5582.

Change-Id: I48036306130d5ccfec683d0dc3e9a642a02ee9c1

compiler/elf_writer_mclinker.cc

diff --git a/compiler/elf_writer_mclinker.cc b/compiler/elf_writer_mclinker.cc
index 3dba426..0e27210 100644
--- a/compiler/elf_writer_mclinker.cc
+++ b/compiler/elf_writer_mclinker.cc
@@ -361,11 +361,10 @@
       ClassLinker* linker = Runtime::Current()->GetClassLinker();
       // Unchecked as we hold mutator_lock_ on entry.
       ScopedObjectAccessUnchecked soa(Thread::Current());
-      StackHandleScope<1> hs(soa.Self());
+      StackHandleScope<2> hs(soa.Self());
       Handle<mirror::DexCache> dex_cache(hs.NewHandle(linker->FindDexCache(dex_file)));
-      method = linker->ResolveMethod(dex_file, method_idx, dex_cache,
-                                     NullHandle<mirror::ClassLoader>(),
-                                     NullHandle<mirror::ArtMethod>(), invoke_type);
+      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);
     }
     const CompiledMethod* compiled_method =