Clean up creating handles from `this`.
Make these member functions static and take an additional
parameter `Handle<.> h_this`. Callers mostly already have
a Handle<> to pass, so we avoid an extra StackHandleScope.
This pattern was already used for some functions.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing --interpreter
Change-Id: I4f4478b0526bcb2f3c23305d3b3cc4a65fff9ff5
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index f69d1bc..4967f9e 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -220,7 +220,11 @@
Handle<mirror::Class> klass = hs.NewHandle(DecodeClass(soa, javaThis));
if (klass->IsProxyClass()) {
- return soa.AddLocalReference<jobjectArray>(klass->GetProxyInterfaces()->Clone(soa.Self()));
+ StackHandleScope<1> hs2(soa.Self());
+ Handle<mirror::ObjectArray<mirror::Class>> interfaces =
+ hs2.NewHandle(klass->GetProxyInterfaces());
+ return soa.AddLocalReference<jobjectArray>(
+ mirror::ObjectArray<mirror::Class>::Clone(interfaces, soa.Self()));
}
const dex::TypeList* iface_list = klass->GetInterfaceTypeList();
diff --git a/runtime/native/java_lang_Object.cc b/runtime/native/java_lang_Object.cc
index 48540f8..8fc10d1 100644
--- a/runtime/native/java_lang_Object.cc
+++ b/runtime/native/java_lang_Object.cc
@@ -18,6 +18,7 @@
#include "nativehelper/jni_macros.h"
+#include "handle_scope-inl.h"
#include "jni/jni_internal.h"
#include "mirror/object-inl.h"
#include "native_util.h"
@@ -27,8 +28,9 @@
static jobject Object_internalClone(JNIEnv* env, jobject java_this) {
ScopedFastNativeObjectAccess soa(env);
- ObjPtr<mirror::Object> o = soa.Decode<mirror::Object>(java_this);
- return soa.AddLocalReference<jobject>(o->Clone(soa.Self()));
+ StackHandleScope<1u> hs(soa.Self());
+ Handle<mirror::Object> o = hs.NewHandle(soa.Decode<mirror::Object>(java_this));
+ return soa.AddLocalReference<jobject>(mirror::Class::Clone(o, soa.Self()));
}
static void Object_notify(JNIEnv* env, jobject java_this) {
diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc
index 2d9e7dc..7c7c553 100644
--- a/runtime/native/java_lang_String.cc
+++ b/runtime/native/java_lang_String.cc
@@ -105,8 +105,9 @@
static jcharArray String_toCharArray(JNIEnv* env, jobject java_this) {
ScopedFastNativeObjectAccess soa(env);
- ObjPtr<mirror::String> s = soa.Decode<mirror::String>(java_this);
- return soa.AddLocalReference<jcharArray>(s->ToCharArray(soa.Self()));
+ StackHandleScope<1u> hs(soa.Self());
+ Handle<mirror::String> s = hs.NewHandle(soa.Decode<mirror::String>(java_this));
+ return soa.AddLocalReference<jcharArray>(mirror::String::ToCharArray(s, soa.Self()));
}
static JNINativeMethod gMethods[] = {
diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc
index 4525157..0d9a257 100644
--- a/runtime/native/java_lang_reflect_Method.cc
+++ b/runtime/native/java_lang_reflect_Method.cc
@@ -59,9 +59,11 @@
++i;
}
CHECK_NE(throws_index, -1);
- ObjPtr<mirror::ObjectArray<mirror::Class>> declared_exceptions =
- klass->GetProxyThrows()->Get(throws_index);
- return soa.AddLocalReference<jobjectArray>(declared_exceptions->Clone(soa.Self()));
+ StackHandleScope<1u> hs(soa.Self());
+ Handle<mirror::ObjectArray<mirror::Class>> declared_exceptions =
+ hs.NewHandle(klass->GetProxyThrows()->Get(throws_index));
+ return soa.AddLocalReference<jobjectArray>(
+ mirror::ObjectArray<mirror::Class>::Clone(declared_exceptions, soa.Self()));
} else {
ObjPtr<mirror::ObjectArray<mirror::Class>> result_array =
annotations::GetExceptionTypesForMethod(method);