src/hotspot/share/prims/jvmtiThreadState.cpp

*** 270,282 ****
      assert(_cur_stack_depth >= 0, "incr/decr_cur_stack_depth mismatch");
    }
  }
  
  int JvmtiThreadState::cur_stack_depth() {
!   guarantee(SafepointSynchronize::is_at_safepoint() ||
!     (JavaThread *)Thread::current() == get_thread(),
!     "must be current thread or at safepoint");
  
    if (!is_interp_only_mode() || _cur_stack_depth == UNKNOWN_STACK_DEPTH) {
      _cur_stack_depth = count_frames();
    } else {
      // heavy weight assert
--- 270,282 ----
      assert(_cur_stack_depth >= 0, "incr/decr_cur_stack_depth mismatch");
    }
  }
  
  int JvmtiThreadState::cur_stack_depth() {
!   Thread *current = Thread::current();
!   guarantee(current == get_thread() || current == get_thread()->active_handshaker(),
!     "must be current thread or direct handshake");
  
    if (!is_interp_only_mode() || _cur_stack_depth == UNKNOWN_STACK_DEPTH) {
      _cur_stack_depth = count_frames();
    } else {
      // heavy weight assert