src/hotspot/share/runtime/safepoint.cpp

*** 461,472 ****
        DEBUG_ONLY(current->reset_visited_for_critical_count(active_safepoint_counter);)
        ThreadSafepointState* cur_state = current->safepoint_state();
        assert(!cur_state->is_running(), "Thread not suspended at safepoint");
        cur_state->restart(); // TSS _running
        assert(cur_state->is_running(), "safepoint state has not been reset");
- 
-       SafepointMechanism::disarm_if_needed(current, false /* NO release */);
      }
    } // ~JavaThreadIteratorWithHandle
  
    // Release threads lock, so threads can be created/destroyed again.
    Threads_lock->unlock();
--- 461,470 ----
*** 703,713 ****
      return false;
    }
  }
  
  bool SafepointSynchronize::handshake_safe(JavaThread *thread) {
-   assert(Thread::current()->is_VM_thread(), "Must be VMThread");
    if (thread->is_ext_suspended() || thread->is_terminated()) {
      return true;
    }
    JavaThreadState stable_state;
    if (try_stable_load_state(&stable_state, thread, InactiveSafepointCounter)) {
--- 701,710 ----