diff options
| author | 2019-03-26 15:17:21 +0000 | |
|---|---|---|
| committer | 2019-03-27 09:45:20 +0000 | |
| commit | 423bebb17f15c3867a52315f0ae421f08f14544f (patch) | |
| tree | 97bdf50c7144ae21e6abfe8bdc26858a6a10f94d /runtime/mirror/object_array.h | |
| parent | 93d99f3665cbd890509f4c707e1a62c5f26d320e (diff) | |
ObjPtr<>-ify mirror::ObjectArray.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I611b3e49d3feed306f6cd35d2b662a1e727e24c6
Diffstat (limited to 'runtime/mirror/object_array.h')
| -rw-r--r-- | runtime/mirror/object_array.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/object_array.h b/runtime/mirror/object_array.h index 6506f6ea9a..f7046d1307 100644 --- a/runtime/mirror/object_array.h +++ b/runtime/mirror/object_array.h @@ -44,7 +44,7 @@ class MANAGED ObjectArray: public Array { template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, ReadBarrierOption kReadBarrierOption = kWithReadBarrier> - ALWAYS_INLINE T* Get(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); + ALWAYS_INLINE ObjPtr<T> Get(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); // Returns true if the object can be stored into the array. If not, throws // an ArrayStoreException and returns false. @@ -74,7 +74,7 @@ class MANAGED ObjectArray: public Array { template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, ReadBarrierOption kReadBarrierOption = kWithReadBarrier> - ALWAYS_INLINE T* GetWithoutChecks(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); + ALWAYS_INLINE ObjPtr<T> GetWithoutChecks(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); // Copy src into this array (dealing with overlaps as memmove does) without assignability checks. void AssignableMemmove(int32_t dst_pos, |