Merge pull request #21342 from babsingh/main12

tajila · web-flow · commit eac2531c1e0e · 2025-03-13T17:48:33.000-04:00
Virtual Threads: Bug fixes for JEP491
diff --git a/runtime/vm/BytecodeInterpreter.hpp b/runtime/vm/BytecodeInterpreter.hpp
@@ -2943,7 +2943,7 @@ class INTERPRETER_CLASS
 					if ((NULL != objectMonitor) && (NULL != objectMonitor->waitingContinuations)) {
 						omrthread_monitor_enter(_vm->blockedVirtualThreadsMutex);
 						J9VMContinuation *head = objectMonitor->waitingContinuations;
-						if (NULL != head) {
+						if ((NULL != head) && (NULL != head->vthread)) {
 							if (omrthread_monitor_notify == notifyFunction) {
 								objectMonitor->waitingContinuations = head->nextWaitingContinuation;
 								head->nextWaitingContinuation = _vm->blockedContinuations;
diff --git a/runtime/vm/ContinuationHelpers.cpp b/runtime/vm/ContinuationHelpers.cpp
@@ -845,6 +845,8 @@ preparePinnedVirtualThreadForUnmount(J9VMThread *currentThread, j9object_t syncO
 						result = J9_OBJECT_MONITOR_OOM;
 						goto done;
 					}
+				} else {
+					objectMonitor = J9_INFLLOCK_OBJECT_MONITOR(lock);
 				}
 
 				detachMonitorInfo(currentThread, objectMonitor);
@@ -877,6 +879,8 @@ preparePinnedVirtualThreadForUnmount(J9VMThread *currentThread, j9object_t syncO
 						result = J9_OBJECT_MONITOR_OOM;
 						goto done;
 					}
+				} else {
+					objectMonitor = J9_INFLLOCK_OBJECT_MONITOR(lock);
 				}
 
 				detachMonitorInfo(currentThread, objectMonitor);

Original file line number	Diff line number	Diff line change
`@@ -845,6 +845,8 @@ preparePinnedVirtualThreadForUnmount(J9VMThread *currentThread, j9object_t syncO`
`845`	`845`	`result = J9_OBJECT_MONITOR_OOM;`
`846`	`846`	`goto done;`
`847`	`847`	`}`
	`848`	`+ } else {`
	`849`	`+ objectMonitor = J9_INFLLOCK_OBJECT_MONITOR(lock);`
`848`	`850`	`}`
`849`	`851`
`850`	`852`	`detachMonitorInfo(currentThread, objectMonitor);`
`@@ -877,6 +879,8 @@ preparePinnedVirtualThreadForUnmount(J9VMThread *currentThread, j9object_t syncO`
`877`	`879`	`result = J9_OBJECT_MONITOR_OOM;`
`878`	`880`	`goto done;`
`879`	`881`	`}`
	`882`	`+ } else {`
	`883`	`+ objectMonitor = J9_INFLLOCK_OBJECT_MONITOR(lock);`
`880`	`884`	`}`
`881`	`885`
`882`	`886`	`detachMonitorInfo(currentThread, objectMonitor);`