src/hotspot/share/runtime/thread.inline.hpp

*** 123,132 ****
--- 123,134 ----
    return _thread_state;
  #endif
  }
  
  inline void JavaThread::set_thread_state(JavaThreadState s) {
+   assert(current_or_null() == NULL || current_or_null() == this,
+          "state change should only be called by the current thread");
  #if defined(PPC64) || defined (AARCH64)
    // Use membars when accessing volatile _thread_state. See
    // Threads::create_vm() for size checks.
    OrderAccess::release_store((volatile jint*)&_thread_state, (jint)s);
  #else