diff options
author | 2018-07-18 10:58:13 +0100 | |
---|---|---|
committer | 2018-07-19 16:04:38 +0100 | |
commit | d93e374e273dd45f5d829399da1d4201bf46057e (patch) | |
tree | 280dc72b2aec4696bbc35ad39ca8d3479107380e /runtime/native/java_lang_Class.cc | |
parent | 7f7f9d3991f3a55da8934a3b72890d4776373598 (diff) |
ObjPtr<>-ify ArtMethod and mirror::Method.
And clean up some forgotten things after old CLs.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I8af0e845c24d674d0efab21d80c29949b1cc0593
Diffstat (limited to 'runtime/native/java_lang_Class.cc')
-rw-r--r-- | runtime/native/java_lang_Class.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index 82e54e2f4c..5a5fb16d0c 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -544,8 +544,8 @@ static jobjectArray Class_getDeclaredConstructorsInternal( if (MethodMatchesConstructor(&m, public_only, enforce_hidden_api)) { DCHECK_EQ(Runtime::Current()->GetClassLinker()->GetImagePointerSize(), kRuntimePointerSize); DCHECK(!Runtime::Current()->IsActiveTransaction()); - auto* constructor = mirror::Constructor::CreateFromArtMethod<kRuntimePointerSize, false>( - soa.Self(), &m); + ObjPtr<mirror::Constructor> constructor = + mirror::Constructor::CreateFromArtMethod<kRuntimePointerSize, false>(soa.Self(), &m); if (UNLIKELY(constructor == nullptr)) { soa.Self()->AssertPendingOOMException(); return nullptr; @@ -605,7 +605,7 @@ static jobjectArray Class_getDeclaredMethodsUnchecked(JNIEnv* env, jobject javaT IsDiscoverable(public_only, enforce_hidden_api, &m)) { DCHECK_EQ(Runtime::Current()->GetClassLinker()->GetImagePointerSize(), kRuntimePointerSize); DCHECK(!Runtime::Current()->IsActiveTransaction()); - auto* method = + ObjPtr<mirror::Method> method = mirror::Method::CreateFromArtMethod<kRuntimePointerSize, false>(soa.Self(), &m); if (method == nullptr) { soa.Self()->AssertPendingException(); @@ -838,7 +838,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { return nullptr; } // Verify that we can access the constructor. - auto* declaring_class = constructor->GetDeclaringClass(); + ObjPtr<mirror::Class> declaring_class = constructor->GetDeclaringClass(); if (!constructor->IsPublic()) { if (caller == nullptr) { caller.Assign(GetCallingClass(soa.Self(), 1)); |