diff options
| author | 2016-10-17 15:46:31 -0700 | |
|---|---|---|
| committer | 2016-10-17 16:16:50 -0700 | |
| commit | bc5a795c0d486c84913d987cad5846ded840cea6 (patch) | |
| tree | 90db29a97a21fa15f4cbc5ffbc1f6dd191add49c /runtime/native/java_lang_Class.cc | |
| parent | 38a4223fcc0493553d9ad324a1dc145869eb663a (diff) | |
Move art/native to ObjPtr
Bug: 31113334
Test: test-art-host
Change-Id: I67eb89cf042c762c6dcd5eb8b008b9a28e9b3319
Diffstat (limited to 'runtime/native/java_lang_Class.cc')
| -rw-r--r-- | runtime/native/java_lang_Class.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index ceb37c488e..ac5dbdabf7 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -497,13 +497,13 @@ static jobjectArray Class_getDeclaredClasses(JNIEnv* env, jobject javaThis) { // Pending exception from GetDeclaredClasses. return nullptr; } - mirror::Class* class_class = mirror::Class::GetJavaLangClass(); - mirror::Class* class_array_class = + ObjPtr<mirror::Class> class_class = mirror::Class::GetJavaLangClass(); + ObjPtr<mirror::Class> class_array_class = Runtime::Current()->GetClassLinker()->FindArrayClass(soa.Self(), &class_class); if (class_array_class == nullptr) { return nullptr; } - mirror::ObjectArray<mirror::Class>* empty_array = + ObjPtr<mirror::ObjectArray<mirror::Class>> empty_array = mirror::ObjectArray<mirror::Class>::Alloc(soa.Self(), class_array_class, 0); return soa.AddLocalReference<jobjectArray>(empty_array); } @@ -527,7 +527,7 @@ static jobject Class_getEnclosingConstructorNative(JNIEnv* env, jobject javaThis if (klass->IsProxyClass() || klass->GetDexCache() == nullptr) { return nullptr; } - mirror::Object* method = annotations::GetEnclosingMethod(klass); + ObjPtr<mirror::Object> method = annotations::GetEnclosingMethod(klass); if (method != nullptr) { if (soa.Decode<mirror::Class>(WellKnownClasses::java_lang_reflect_Constructor) == method->GetClass()) { @@ -544,7 +544,7 @@ static jobject Class_getEnclosingMethodNative(JNIEnv* env, jobject javaThis) { if (klass->IsProxyClass() || klass->GetDexCache() == nullptr) { return nullptr; } - mirror::Object* method = annotations::GetEnclosingMethod(klass); + ObjPtr<mirror::Object> method = annotations::GetEnclosingMethod(klass); if (method != nullptr) { if (soa.Decode<mirror::Class>(WellKnownClasses::java_lang_reflect_Method) == method->GetClass()) { @@ -660,7 +660,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { // Invoke the string allocator to return an empty string for the string class. if (klass->IsStringClass()) { gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); - mirror::Object* obj = mirror::String::AllocEmptyString<true>(soa.Self(), allocator_type); + ObjPtr<mirror::Object> obj = mirror::String::AllocEmptyString<true>(soa.Self(), allocator_type); if (UNLIKELY(soa.Self()->IsExceptionPending())) { return nullptr; } else { |