Disallow NotifyFramePop for enter/enter0/VirtualThread.run/VThreadCon…

…tinuation.run
sspitsyn · Oct 9, 2024 · 3317ea8 · 3317ea8
1 parent 8ec7bd3
commit 3317ea8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -1354,7 +1354,8 @@ JvmtiEnvBase::set_frame_pop(JvmtiThreadState* state, javaVFrame* jvf, jint depth
   if (jvf == nullptr) {
     return JVMTI_ERROR_NO_MORE_FRAMES;
   }
-  if (jvf->method()->is_native()) {
+  if (jvf->method()->is_native() ||
+     (state->is_virtual() && (jvf->is_vthread_entry() || jvf->method()->jvmti_mount_transition()))) {
     return JVMTI_ERROR_OPAQUE_FRAME;
   }
   assert(jvf->frame_pointer() != nullptr, "frame pointer mustn't be null");

diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -213,8 +213,15 @@ protected void onPinned(Continuation.Pinned reason) {
         private static Runnable wrap(VirtualThread vthread, Runnable task) {
             return new Runnable() {
                 @Hidden
+                @JvmtiMountTransition
                 public void run() {
+                    // notify JVMTI
+                    vthread.notifyJvmtiStart();
+
                     vthread.run(task);
+
+                    // notify JVMTI
+                    vthread.notifyJvmtiEnd();
                 }
             };
         }
@@ -389,9 +396,6 @@ private void submitFailed(RejectedExecutionException ree) {
     private void run(Runnable task) {
         assert Thread.currentThread() == this && state == RUNNING;
 
-        // notify JVMTI, may post VirtualThreadStart event
-        notifyJvmtiStart();
-
         // emit JFR event if enabled
         if (VirtualThreadStartEvent.isTurnedOn()) {
             var event = new VirtualThreadStartEvent();
@@ -417,8 +421,6 @@ private void run(Runnable task) {
                 }
 
             } finally {
-                // notify JVMTI, may post VirtualThreadEnd event
-                notifyJvmtiEnd();
             }
         }
     }