From 3068d582eff4552ff260d7966fcbdc93e17d0207 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 28 May 2019 16:39:29 +0100 Subject: 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 --- runtime/native/java_lang_String.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'runtime/native/java_lang_String.cc') diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc index 2d9e7dc55d..7c7c5537fb 100644 --- a/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc @@ -105,8 +105,9 @@ static jstring String_doReplace(JNIEnv* env, jobject java_this, jchar old_c, jch static jcharArray String_toCharArray(JNIEnv* env, jobject java_this) { ScopedFastNativeObjectAccess soa(env); - ObjPtr s = soa.Decode(java_this); - return soa.AddLocalReference(s->ToCharArray(soa.Self())); + StackHandleScope<1u> hs(soa.Self()); + Handle s = hs.NewHandle(soa.Decode(java_this)); + return soa.AddLocalReference(mirror::String::ToCharArray(s, soa.Self())); } static JNINativeMethod gMethods[] = { -- cgit v1.2.3-59-g8ed1b