allow wrong phase during shutdown

plummercj · plummercj · commit fab2d34e61c5 · 2025-12-03T19:59:26.000-08:00
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -170,6 +170,10 @@ setThreadLocalStorage(jthread thread, ThreadNode *node)
             return;
         }
     }
+    if (error == JVMTI_ERROR_WRONG_PHASE && gdata->vmDead && isVThread(thread)) {
+        // Just return. This can happen with vthreads when the vm is exiting.
+        return;
+    }
     if (error != JVMTI_ERROR_NONE) {
         // The jthread object must be valid, so this must be a fatal error.
         EXIT_ERROR(error, "cannot set thread local storage");

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,10 @@ setThreadLocalStorage(jthread thread, ThreadNode *node)`
`170`	`170`	`return;`
`171`	`171`	`}`
`172`	`172`	`}`
	`173`	`+ if (error == JVMTI_ERROR_WRONG_PHASE && gdata->vmDead && isVThread(thread)) {`
	`174`	`+ // Just return. This can happen with vthreads when the vm is exiting.`
	`175`	`+ return;`
	`176`	`+ }`
`173`	`177`	`if (error != JVMTI_ERROR_NONE) {`
`174`	`178`	`// The jthread object must be valid, so this must be a fatal error.`
`175`	`179`	`EXIT_ERROR(error, "cannot set thread local storage");`