Clear vmthread from thread object at shutdown

Related to: #16659 Signed-off-by: Tobi Ajila <[email protected]>
eclipse-openj9 · Oct 19, 2023 · 6575206 · 6575206
1 parent 7cf716a
commit 6575206
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/runtime/vm/vmthread.cpp b/runtime/vm/vmthread.cpp
@@ -455,6 +455,10 @@ void threadCleanup(J9VMThread * vmThread, UDATA forkedByVM)
 	/* Do the java dance to indicate thread death */
 	acquireVMAccess(vmThread);
 	cleanUpAttachedThread(vmThread);
+	/* Cleanup code is not guaranteed to run succesfully. Remove any connection
+	 * to the thread object before deallocating the j9vmthread.
+	 */
+	J9VMJAVALANGTHREAD_SET_THREADREF(vmThread, vmThread->threadObject, NULL);
 	releaseVMAccess(vmThread);