diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/dex_file_annotations.cc | |
| parent | d1224dce59eb0019507e41da5e10f12dda66bee4 (diff) | |
Clean up ScopedThreadStateChange to use ObjPtr
Also fixed inclusion of -inl.h files in .h files by adding
scoped_object_access-inl.h and scoped_fast_natvie_object_access-inl.h
Changed AddLocalReference / Decode to use ObjPtr.
Changed libartbenchmark to be debug to avoid linkage errors.
Bug: 31113334
Test: test-art-host
Change-Id: I4d2e160483a29d21e1e0e440585ed328b9811483
Diffstat (limited to 'runtime/dex_file_annotations.cc')
| -rw-r--r-- | runtime/dex_file_annotations.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/dex_file_annotations.cc b/runtime/dex_file_annotations.cc index 789a5bd886..5763479fe3 100644 --- a/runtime/dex_file_annotations.cc +++ b/runtime/dex_file_annotations.cc @@ -255,7 +255,7 @@ mirror::Object* ProcessEncodedAnnotation(Handle<mirror::Class> klass, const uint } mirror::Class* annotation_member_class = - soa.Decode<mirror::Class*>(WellKnownClasses::libcore_reflect_AnnotationMember); + soa.Decode<mirror::Class>(WellKnownClasses::libcore_reflect_AnnotationMember).Decode(); mirror::Class* annotation_member_array_class = class_linker->FindArrayClass(self, &annotation_member_class); if (annotation_member_array_class == nullptr) { @@ -782,7 +782,7 @@ mirror::ObjectArray<mirror::Object>* ProcessAnnotationSet( ScopedObjectAccessUnchecked soa(self); StackHandleScope<2> hs(self); Handle<mirror::Class> annotation_array_class(hs.NewHandle( - soa.Decode<mirror::Class*>(WellKnownClasses::java_lang_annotation_Annotation__array))); + soa.Decode<mirror::Class>(WellKnownClasses::java_lang_annotation_Annotation__array))); if (annotation_set == nullptr) { return mirror::ObjectArray<mirror::Object>::Alloc(self, annotation_array_class.Get(), 0); } @@ -840,7 +840,7 @@ mirror::ObjectArray<mirror::Object>* ProcessAnnotationSetRefList( ScopedObjectAccessUnchecked soa(self); StackHandleScope<1> hs(self); mirror::Class* annotation_array_class = - soa.Decode<mirror::Class*>(WellKnownClasses::java_lang_annotation_Annotation__array); + soa.Decode<mirror::Class>(WellKnownClasses::java_lang_annotation_Annotation__array).Decode(); mirror::Class* annotation_array_array_class = Runtime::Current()->GetClassLinker()->FindArrayClass(self, &annotation_array_class); if (annotation_array_array_class == nullptr) { |