Merge pull request eclipse-openj9#21361 from fengxue-IS/jep491-interrupt

Fix Object.wait logic for vthread

Author: babsingh

runtime/oti/vmconstantpool.xml

@@ -270,6 +270,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 	<fieldref class="java/lang/VirtualThread" name="next" signature="Ljava/lang/VirtualThread;" versions="24-"/>
 	<fieldref class="java/lang/VirtualThread" name="notified" signature="Z" versions="24-"/>
 	<fieldref class="java/lang/VirtualThread" name="onWaitingList" signature="Z" versions="24-"/>
+	<fieldref class="java/lang/VirtualThread" name="timeout" signature="J" versions="24-"/>
 
 	<fieldref class="java/lang/Throwable" name="cause" signature="Ljava/lang/Throwable;"/>
 	<fieldref class="java/lang/Throwable" name="detailMessage" signature="Ljava/lang/String;"/>

runtime/vm/BytecodeInterpreter.hpp

@@ -5228,6 +5228,10 @@ class INTERPRETER_CLASS
 					restoreInternalNativeStackFrame(REGISTER_ARGS);
 					/* Handle the virtual thread Object.wait call. */
 					J9VMJAVALANGVIRTUALTHREAD_SET_NOTIFIED(_currentThread, _currentThread->threadObject, JNI_FALSE);
+					/* VirtualThread.timeout is a private field used by both VM and JCL to temporarily hold
+					 * the value of expected wait/park time before a wake up task is scheduled using the value.
+					 */
+					J9VMJAVALANGVIRTUALTHREAD_SET_TIMEOUT(_currentThread, _currentThread->threadObject, millis + (nanos / 1000000));
 					rc = yieldPinnedContinuation(REGISTER_ARGS, newState, J9VM_CONTINUATION_RETURN_FROM_OBJECT_WAIT);
 				} else {
 					rc = THROW_MONITOR_ALLOC_FAIL;
@@ -5777,7 +5781,18 @@ class INTERPRETER_CLASS
 				omrthread_monitor_t monitor = getMonitorForWait(_currentThread, waitObject);
 				monitor->count = _currentThread->currentContinuation->waitingMonitorEnterCount;
 				_currentThread->currentContinuation->waitingMonitorEnterCount = 0;
-				returnVoidFromINL(REGISTER_ARGS, 4);
+				_currentThread->ownedMonitorCount -= 1;
+				if (J9VMJAVALANGTHREAD_DEADINTERRUPT(_currentThread, _currentThread->threadObject)) {
+					/* Build a native frame on vthread stack before throwing exception. */
+					buildInternalNativeStackFrame(REGISTER_ARGS);
+					updateVMStruct(REGISTER_ARGS);
+					prepareForExceptionThrow(_currentThread);
+					setCurrentException(_currentThread, J9VMCONSTANTPOOL_JAVALANGINTERRUPTEDEXCEPTION, NULL);
+					VMStructHasBeenUpdated(REGISTER_ARGS);
+					rc = GOTO_THROW_CURRENT_EXCEPTION;
+				} else {
+					returnVoidFromINL(REGISTER_ARGS, 4);
+				}
 			}
 			break;
 		}