diff options
| author | 2016-10-17 15:46:31 -0700 | |
|---|---|---|
| committer | 2016-10-17 16:16:50 -0700 | |
| commit | bc5a795c0d486c84913d987cad5846ded840cea6 (patch) | |
| tree | 90db29a97a21fa15f4cbc5ffbc1f6dd191add49c /runtime/dex_file_annotations.cc | |
| parent | 38a4223fcc0493553d9ad324a1dc145869eb663a (diff) | |
Move art/native to ObjPtr
Bug: 31113334
Test: test-art-host
Change-Id: I67eb89cf042c762c6dcd5eb8b008b9a28e9b3319
Diffstat (limited to 'runtime/dex_file_annotations.cc')
| -rw-r--r-- | runtime/dex_file_annotations.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/dex_file_annotations.cc b/runtime/dex_file_annotations.cc index 576c4aa849..e5383341fb 100644 --- a/runtime/dex_file_annotations.cc +++ b/runtime/dex_file_annotations.cc @@ -254,7 +254,7 @@ mirror::Object* ProcessEncodedAnnotation(Handle<mirror::Class> klass, const uint return nullptr; } - mirror::Class* annotation_member_class = + ObjPtr<mirror::Class> annotation_member_class = soa.Decode<mirror::Class>(WellKnownClasses::libcore_reflect_AnnotationMember).Ptr(); mirror::Class* annotation_member_array_class = class_linker->FindArrayClass(self, &annotation_member_class); @@ -731,7 +731,7 @@ mirror::ObjectArray<mirror::String>* GetSignatureValue(Handle<mirror::Class> kla if (annotation_item == nullptr) { return nullptr; } - mirror::Class* string_class = mirror::String::GetJavaLangString(); + ObjPtr<mirror::Class> string_class = mirror::String::GetJavaLangString(); Handle<mirror::Class> string_array_class(hs.NewHandle( Runtime::Current()->GetClassLinker()->FindArrayClass(Thread::Current(), &string_class))); if (string_array_class.Get() == nullptr) { @@ -757,7 +757,7 @@ mirror::ObjectArray<mirror::Class>* GetThrowsValue(Handle<mirror::Class> klass, if (annotation_item == nullptr) { return nullptr; } - mirror::Class* class_class = mirror::Class::GetJavaLangClass(); + ObjPtr<mirror::Class> class_class = mirror::Class::GetJavaLangClass(); Handle<mirror::Class> class_array_class(hs.NewHandle( Runtime::Current()->GetClassLinker()->FindArrayClass(Thread::Current(), &class_class))); if (class_array_class.Get() == nullptr) { @@ -839,8 +839,8 @@ mirror::ObjectArray<mirror::Object>* ProcessAnnotationSetRefList( Thread* self = Thread::Current(); ScopedObjectAccessUnchecked soa(self); StackHandleScope<1> hs(self); - mirror::Class* annotation_array_class = - soa.Decode<mirror::Class>(WellKnownClasses::java_lang_annotation_Annotation__array).Ptr(); + ObjPtr<mirror::Class> annotation_array_class = + soa.Decode<mirror::Class>(WellKnownClasses::java_lang_annotation_Annotation__array); mirror::Class* annotation_array_array_class = Runtime::Current()->GetClassLinker()->FindArrayClass(self, &annotation_array_class); if (annotation_array_array_class == nullptr) { @@ -1049,7 +1049,7 @@ bool GetParametersMetadataForMethod(ArtMethod* method, StackHandleScope<5> hs(Thread::Current()); // Extract the parameters' names String[]. - mirror::Class* string_class = mirror::String::GetJavaLangString(); + ObjPtr<mirror::Class> string_class = mirror::String::GetJavaLangString(); Handle<mirror::Class> string_array_class(hs.NewHandle( Runtime::Current()->GetClassLinker()->FindArrayClass(Thread::Current(), &string_class))); if (UNLIKELY(string_array_class.Get() == nullptr)) { @@ -1139,7 +1139,7 @@ mirror::ObjectArray<mirror::Class>* GetDeclaredClasses(Handle<mirror::Class> kla return nullptr; } StackHandleScope<1> hs(Thread::Current()); - mirror::Class* class_class = mirror::Class::GetJavaLangClass(); + ObjPtr<mirror::Class> class_class = mirror::Class::GetJavaLangClass(); Handle<mirror::Class> class_array_class(hs.NewHandle( Runtime::Current()->GetClassLinker()->FindArrayClass(hs.Self(), &class_class))); if (class_array_class.Get() == nullptr) { |