src/hotspot/share/services/threadService.cpp

*** 367,377 ****
              break;
            }
          }
        } else {
          if (concurrent_locks) {
!           if (waitingToLockBlocker->is_a(SystemDictionary::abstract_ownable_synchronizer_klass())) {
              oop threadObj = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(waitingToLockBlocker);
              // This JavaThread (if there is one) is protected by the
              // ThreadsListSetter in VM_FindDeadlocks::doit().
              currentThread = threadObj != NULL ? java_lang_Thread::thread(threadObj) : NULL;
            } else {
--- 367,377 ----
              break;
            }
          }
        } else {
          if (concurrent_locks) {
!           if (waitingToLockBlocker->is_a(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass())) {
              oop threadObj = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(waitingToLockBlocker);
              // This JavaThread (if there is one) is protected by the
              // ThreadsListSetter in VM_FindDeadlocks::doit().
              currentThread = threadObj != NULL ? java_lang_Thread::thread(threadObj) : NULL;
            } else {
*** 676,686 ****
    assert(SafepointSynchronize::is_at_safepoint(), "all threads are stopped");
  
    GrowableArray<oop>* aos_objects = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<oop>(INITIAL_ARRAY_SIZE, true /* C_heap */);
  
    // Find all instances of AbstractOwnableSynchronizer
!   HeapInspection::find_instances_at_safepoint(SystemDictionary::abstract_ownable_synchronizer_klass(),
                                                  aos_objects);
    // Build a map of thread to its owned AQS locks
    build_map(aos_objects);
  
    delete aos_objects;
--- 676,686 ----
    assert(SafepointSynchronize::is_at_safepoint(), "all threads are stopped");
  
    GrowableArray<oop>* aos_objects = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<oop>(INITIAL_ARRAY_SIZE, true /* C_heap */);
  
    // Find all instances of AbstractOwnableSynchronizer
!   HeapInspection::find_instances_at_safepoint(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass(),
                                                aos_objects);
    // Build a map of thread to its owned AQS locks
    build_map(aos_objects);
  
    delete aos_objects;
*** 830,840 ****
    if (JDK_Version::current().supports_thread_park_blocker() &&
          (_thread_status == java_lang_Thread::PARKED ||
           _thread_status == java_lang_Thread::PARKED_TIMED)) {
  
      _blocker_object = thread->current_park_blocker();
!     if (_blocker_object != NULL && _blocker_object->is_a(SystemDictionary::abstract_ownable_synchronizer_klass())) {
        _blocker_object_owner = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(_blocker_object);
      }
    }
  }
  
--- 830,840 ----
    if (JDK_Version::current().supports_thread_park_blocker() &&
          (_thread_status == java_lang_Thread::PARKED ||
           _thread_status == java_lang_Thread::PARKED_TIMED)) {
  
      _blocker_object = thread->current_park_blocker();
!     if (_blocker_object != NULL && _blocker_object->is_a(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass())) {
        _blocker_object_owner = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(_blocker_object);
      }
    }
  }
  
*** 921,931 ****
        }
      } else {
        st->print("  waiting for ownable synchronizer " INTPTR_FORMAT ", (a %s)",
                  p2i(waitingToLockBlocker),
                  waitingToLockBlocker->klass()->external_name());
!       assert(waitingToLockBlocker->is_a(SystemDictionary::abstract_ownable_synchronizer_klass()),
               "Must be an AbstractOwnableSynchronizer");
        oop ownerObj = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(waitingToLockBlocker);
        currentThread = java_lang_Thread::thread(ownerObj);
        assert(currentThread != NULL, "AbstractOwnableSynchronizer owning thread is unexpectedly NULL");
      }
--- 921,931 ----
        }
      } else {
        st->print("  waiting for ownable synchronizer " INTPTR_FORMAT ", (a %s)",
                  p2i(waitingToLockBlocker),
                  waitingToLockBlocker->klass()->external_name());
!       assert(waitingToLockBlocker->is_a(SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass()),
               "Must be an AbstractOwnableSynchronizer");
        oop ownerObj = java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(waitingToLockBlocker);
        currentThread = java_lang_Thread::thread(ownerObj);
        assert(currentThread != NULL, "AbstractOwnableSynchronizer owning thread is unexpectedly NULL");
      }