commit 281e5002fe818ce75e6ca7b7f9bdffcd2a43231a
author Mathieu Chartier <mathieuc@google.com> Thu Jun 11 16:21:42 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Jun 11 17:12:32 2015 -0700
tree 6648ffb3f15feb5d48e0ca87d8b8d2a9b73e06ad
parent 8d73a91d8f4c89ac152d18081b07093f68c56a11

Fix compaction bug in Class_getDeclaredMethodsUnchecked

Added handle to fix the bug.

(cherry picked from commit b89a8c66e360575d2dc1ec1229235735c56968ff)

Bug: 21638351
Change-Id: I1c3abea33aa825d3a28c1fc5cb415508686ad93e

runtime/native/java_lang_Class.cc

diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index 94024ef..67dcc9c 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -380,8 +380,8 @@
 static jobjectArray Class_getDeclaredMethodsUnchecked(JNIEnv* env, jobject javaThis,
                                                       jboolean publicOnly) {
   ScopedFastNativeObjectAccess soa(env);
-  StackHandleScope<3> hs(soa.Self());
-  auto* klass = DecodeClass(soa, javaThis);
+  StackHandleScope<2> hs(soa.Self());
+  auto klass = hs.NewHandle(DecodeClass(soa, javaThis));
   size_t num_methods = 0;
   for (auto& m : klass->GetVirtualMethods(sizeof(void*))) {
     auto modifiers = m.GetAccessFlags();