8310584: GetThreadState reports blocked and runnable for pinned suspended virtual threads

Reviewed-by: sspitsyn, dholmes

Author: Alex Menkov

src/hotspot/share/prims/jvmtiEnvBase.cpp

@@ -799,12 +799,14 @@ JvmtiEnvBase::get_vthread_state(oop thread_oop, JavaThread* java_thread) {
     int vt_state = java_lang_VirtualThread::state(thread_oop);
     state = (jint)java_lang_VirtualThread::map_state_to_thread_status(vt_state);
   }
-  if (ext_suspended && ((state & JVMTI_THREAD_STATE_ALIVE) != 0)) {
-    state &= ~java_lang_VirtualThread::RUNNING;
-    state |= JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_RUNNABLE | JVMTI_THREAD_STATE_SUSPENDED;
-  }
-  if (interrupted) {
-    state |= JVMTI_THREAD_STATE_INTERRUPTED;
+  // Ensure the thread has not exited after retrieving suspended/interrupted values.
+  if ((state & JVMTI_THREAD_STATE_ALIVE) != 0) {
+    if (ext_suspended) {
+      state |= JVMTI_THREAD_STATE_SUSPENDED;
+    }
+    if (interrupted) {
+      state |= JVMTI_THREAD_STATE_INTERRUPTED;
+    }
   }
   return state;
 }

test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java

@@ -238,13 +238,11 @@ static void inNative() throws Exception {
 
     public static void main(String[] args) throws Exception {
         runnable();
-        /* "waiting" test cases fail due JDK-8310584
         blockedOnMonitorEnter();
         waiting(false);
         waiting(true);
         sleeping();
         parked();
-        */
         inNative();
 
         int errCount = getErrorCount();