diff options
Diffstat (limited to 'runtime/mirror/object_array.h')
| -rw-r--r-- | runtime/mirror/object_array.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/mirror/object_array.h b/runtime/mirror/object_array.h index 668b276dc9..7f9e716e6e 100644 --- a/runtime/mirror/object_array.h +++ b/runtime/mirror/object_array.h @@ -37,22 +37,27 @@ class MANAGED ObjectArray : public Array { // Returns true if the object can be stored into the array. If not, throws // an ArrayStoreException and returns false. - bool CheckAssignable(T* object) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + // TODO fix thread safety analysis: should be SHARED_LOCKS_REQUIRED(Locks::mutator_lock_). + template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> + bool CheckAssignable(T* object) NO_THREAD_SAFETY_ANALYSIS; void Set(int32_t i, T* object) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // TODO fix thread safety analysis: should be SHARED_LOCKS_REQUIRED(Locks::mutator_lock_). - template<bool kTransactionActive, bool kCheckTransaction = true> + template<bool kTransactionActive, bool kCheckTransaction = true, + VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> void Set(int32_t i, T* object) NO_THREAD_SAFETY_ANALYSIS; // Set element without bound and element type checks, to be used in limited // circumstances, such as during boot image writing. // TODO fix thread safety analysis broken by the use of template. This should be // SHARED_LOCKS_REQUIRED(Locks::mutator_lock_). - template<bool kTransactionActive, bool kCheckTransaction = true> + template<bool kTransactionActive, bool kCheckTransaction = true, + VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> void SetWithoutChecks(int32_t i, T* object) NO_THREAD_SAFETY_ANALYSIS; // TODO fix thread safety analysis broken by the use of template. This should be // SHARED_LOCKS_REQUIRED(Locks::mutator_lock_). - template<bool kTransactionActive, bool kCheckTransaction = true> + template<bool kTransactionActive, bool kCheckTransaction = true, + VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> void SetWithoutChecksAndWriteBarrier(int32_t i, T* object) NO_THREAD_SAFETY_ANALYSIS; T* GetWithoutChecks(int32_t i) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |