From 8bc6a58df7046b4d6f4b51eb274c7e60fea396ff Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Tue, 19 Dec 2023 18:48:15 +0000 Subject: Revert^17 "Thread suspension cleanup and deadlock fix" This reverts commit c6371b52df0da31acc174a3526274417b7aac0a7. Reason for revert: This seems to have two remaining issues: 1. The second DCHECK in WaitForFlipFunction is not completely guaranteed to hold, resulting in failures for 658-fp-read-barrier. 2. WaitForSuspendBarrier seems to time out occasionally, possibly spuriously so. We fail when the futex times out once. That's probably incompatible with the app freezer. We should retry a few times. Change-Id: Ibd8909b31083fc29e6d4f1fcde003d08eb16fc0a --- runtime/mirror/object.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'runtime/mirror/object.h') diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h index ecd8a48a96..54a17b1d4e 100644 --- a/runtime/mirror/object.h +++ b/runtime/mirror/object.h @@ -138,16 +138,11 @@ class MANAGED LOCKABLE Object { REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); - // Returns a nonzero value that fits into lockword slot. int32_t IdentityHashCode() REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::thread_list_lock_, !Locks::thread_suspend_count_lock_); - // Identical to the above, but returns 0 if monitor inflation would otherwise be needed. - int32_t IdentityHashCodeNoInflation() REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Locks::thread_list_lock_, !Locks::thread_suspend_count_lock_); - static constexpr MemberOffset MonitorOffset() { return OFFSET_OF_OBJECT_MEMBER(Object, monitor_); } @@ -732,10 +727,6 @@ class MANAGED LOCKABLE Object { REQUIRES_SHARED(Locks::mutator_lock_); private: - template - int32_t IdentityHashCodeHelper() REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Locks::thread_list_lock_, !Locks::thread_suspend_count_lock_); - // Get a field with acquire semantics. template ALWAYS_INLINE kSize GetFieldAcquire(MemberOffset field_offset) -- cgit v1.2.3-59-g8ed1b