Revert "Revert^14 "Thread suspension cleanup and deadlock fix""

This reverts commit f9fdd3ce0180972dc8d4f0c8410ea7702828a703.

Reason for revert: Very suspicious host-x86_64-debug failure on LUCI.

Change-Id: Ia01dd3df8d64d6bc0d12319b06a8380f64a46785

1 files changed, 0 insertions, 9 deletions

diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h
index 5e770f45a5..95b9f86a4b 100644
--- a/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@ -137,16 +137,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_);
   }
@@ -731,10 +726,6 @@ class MANAGED LOCKABLE Object {
       REQUIRES_SHARED(Locks::mutator_lock_);
 
  private:
-  template <bool kAllowInflation>
-  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<typename kSize>
   ALWAYS_INLINE kSize GetFieldAcquire(MemberOffset field_offset)