Pin virtual thread in JNI MonitorEnter

Author: pron

src/hotspot/share/prims/jni.cpp

@@ -2718,6 +2718,10 @@ JNI_ENTRY(jint, jni_MonitorEnter(JNIEnv *env, jobject jobj))
 
   Handle obj(thread, JNIHandles::resolve_non_null(jobj));
   ObjectSynchronizer::jni_enter(obj, thread);
+  if (!Continuation::pin(thread)) {
+    ObjectSynchronizer::jni_exit(obj(), CHECK_(JNI_ERR));
+    THROW_(vmSymbols::java_lang_IllegalMonitorStateException(), JNI_ERR);
+  }
   ret = JNI_OK;
   return ret;
 JNI_END
@@ -2737,7 +2741,9 @@ JNI_ENTRY(jint, jni_MonitorExit(JNIEnv *env, jobject jobj))
 
   Handle obj(THREAD, JNIHandles::resolve_non_null(jobj));
   ObjectSynchronizer::jni_exit(obj(), CHECK_(JNI_ERR));
-
+  if (!Continuation::unpin(thread)) {
+    THROW_(vmSymbols::java_lang_IllegalMonitorStateException(), JNI_ERR);
+  }
   ret = JNI_OK;
   return ret;
 JNI_END

src/hotspot/share/runtime/continuation.cpp

@@ -3266,7 +3266,7 @@ oop Continuation::continuation_scope(oop cont) {
 bool Continuation::pin(JavaThread* current) {
   ContinuationEntry* ce = current->last_continuation();
   if (ce == nullptr)
-    return false;
+    return true;
 
   oop cont = ce->cont_oop();
   assert (cont != nullptr, "");
@@ -3283,7 +3283,7 @@ bool Continuation::pin(JavaThread* current) {
 bool Continuation::unpin(JavaThread* current) {
   ContinuationEntry* ce = current->last_continuation();
   if (ce == nullptr)
-    return false;
+    return true;
 
   oop cont = ce->cont_oop();
   assert (cont != nullptr, "");