Fix interruptLock deadlock and numerous other issues.

Author: peter-hofer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java

@@ -71,6 +71,7 @@
 import com.oracle.svm.core.monitor.MonitorSupport;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
+import com.oracle.svm.core.thread.VirtualThreads;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -104,12 +105,28 @@ private void waitSubst(long timeoutMillis) throws InterruptedException {
         MonitorSupport.singleton().wait(this, timeoutMillis);
     }
 
+    /**
+     * Our monitors do not pin virtual threads, so we must avoid {@code jdk.internal.misc.Blocker}
+     * which expects and asserts that the virtual thread is pinned.
+     */
     @Substitute
-    @TargetElement(name = "wait0", onlyWith = JDK19OrLater.class)
-    private void waitSubstLoom(long timeoutMillis) throws InterruptedException {
-        MonitorSupport.singleton().wait(this, timeoutMillis);
+    @TargetElement(name = "wait", onlyWith = JDK19OrLater.class)
+    private void waitSubstJDK19(long timeoutMillis) throws InterruptedException {
+        try {
+            MonitorSupport.singleton().wait(this, timeoutMillis);
+        } catch (InterruptedException e) {
+            Thread thread = Thread.currentThread();
+            if (VirtualThreads.isSupported() && VirtualThreads.singleton().isVirtual(thread)) {
+                VirtualThreads.singleton().getAndClearInterrupt(thread);
+            }
+            throw e;
+        }
     }
 
+    @Delete
+    @TargetElement(onlyWith = JDK19OrLater.class)
+    private native void wait0(long timeoutMillis);
+
     @Substitute
     @TargetElement(name = "notify")
     private void notifySubst() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java

@@ -48,6 +48,7 @@
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
+import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.AutomaticFeature;
@@ -332,6 +333,19 @@ public static int getCommonPoolParallelism() {
     @TargetElement(onlyWith = JDK17OrEarlier.class)//
     static int COMMON_PARALLELISM;
 
+    @Alias @TargetElement(onlyWith = JDK19OrLater.class) //
+    private static Unsafe U;
+
+    @Alias @TargetElement(onlyWith = JDK19OrLater.class) //
+    private static long POOLIDS;
+
+    @Substitute
+    @TargetElement(onlyWith = JDK19OrLater.class) //
+    private static int getAndAddPoolIds(int x) {
+        // Original method wrongly uses ForkJoinPool.class instead of calling U.staticFieldBase()
+        return U.getAndAddInt(StaticFieldsSupport.getStaticPrimitiveFields(), POOLIDS, x);
+    }
+
     @Alias //
     Target_java_util_concurrent_ForkJoinPool(byte forCommonPoolOnly) {
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java

@@ -138,10 +138,8 @@ public static boolean shouldShowFrame(FrameInfoQueryResult frameInfo, boolean sh
         }
 
         if (LoomSupport.isEnabled() && clazz == Target_jdk_internal_vm_Continuation.class) {
-            // Skip intrinsics in JDK
-            if ("enterSpecial".equals(frameInfo.getSourceMethodName())) {
-                return false;
-            } else if ("doYield".equals(frameInfo.getSourceMethodName())) {
+            String name = frameInfo.getSourceMethodName();
+            if ("enter0".equals(name) || "enterSpecial".equals(name)) {
                 return false;
             }
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_StackWalker.java

@@ -143,7 +143,7 @@ private <T> T walk(Function<? super Stream<StackFrame>, ? extends T> function) {
             Target_jdk_internal_vm_ContinuationScope delimitationScope = this.contScope != null ? this.contScope : Target_java_lang_VirtualThread.continuationScope();
             Target_jdk_internal_vm_Continuation topContinuation = Target_jdk_internal_vm_Continuation.getCurrentContinuation(delimitationScope);
             if (topContinuation != null) {
-                JavaStackWalker.initWalk(walk, sp, LoomSupport.getBaseSP(topContinuation));
+                JavaStackWalker.initWalk(walk, sp, LoomSupport.getInternalContinuation(topContinuation).getBaseSP());
             } else {
                 // the delimitation scope is not present in current continuation chain or null
                 JavaStackWalker.initWalk(walk, sp);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java

@@ -28,6 +28,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
+import com.oracle.svm.core.thread.ThreadStatus;
 
 /**
  * This interface provides functions related to monitor operations (the Java "synchronized" keyword
@@ -101,14 +102,14 @@ public final void wait(Object obj, long timeoutMillis) throws InterruptedExcepti
     public abstract void notify(Object obj, boolean notifyAll);
 
     /**
-     * Called from {@code Unsafe.park} when changing the current thread's state before parking the
-     * thread. When the thread is parked due to a monitor operation, we need to alter the new thread
-     * state so {@link Thread#getState()} gives the expected result.
+     * Gets a {@link ThreadStatus} for the given parking thread, determining whether it parks
+     * because of a monitor, and if so, returning monitor-specific status codes such as
+     * {@link ThreadStatus#BLOCKED_ON_MONITOR_ENTER} or {@link ThreadStatus#IN_OBJECT_WAIT_TIMED},
+     * or if not, {@link ThreadStatus#PARKED} or {@link ThreadStatus#PARKED_TIMED}.
      *
-     * Note that the thread state is set only while the thread is parked, but if the thread is
-     * spuriously unparked, the thread's state briefly changes to running until it parks again. This
-     * is a difference to other VMs which remain in the blocked/waiting state until the monitor has
-     * been successfully acquired.
+     * Note that when a thread is spuriously unparked, the thread's state briefly changes to running
+     * until it parks again. This is a difference to other VMs which remain in the blocked/waiting
+     * state until the monitor has been successfully acquired.
      */
-    public abstract int maybeAdjustNewParkStatus(int status);
+    public abstract int getParkedThreadStatus(Thread thread, boolean timed);
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java

@@ -182,19 +182,16 @@ public class MultiThreadedMonitorSupport extends MonitorSupport {
     private final ReentrantLock additionalMonitorsLock = new ReentrantLock();
 
     @Override
-    public int maybeAdjustNewParkStatus(int status) {
-        Object blocker = LockSupport.getBlocker(Thread.currentThread());
+    public int getParkedThreadStatus(Thread thread, boolean timed) {
+        Object blocker = LockSupport.getBlocker(thread);
         if (blocker instanceof JavaMonitorConditionObject) {
             // Blocked on one of the condition objects that implement Object.wait()
-            if (status == ThreadStatus.PARKED_TIMED) {
-                return ThreadStatus.IN_OBJECT_WAIT_TIMED;
-            }
-            return ThreadStatus.IN_OBJECT_WAIT;
+            return timed ? ThreadStatus.IN_OBJECT_WAIT_TIMED : ThreadStatus.IN_OBJECT_WAIT;
         } else if (blocker instanceof JavaMonitor) {
             // Blocked directly on the lock
             return ThreadStatus.BLOCKED_ON_MONITOR_ENTER;
         }
-        return status;
+        return timed ? ThreadStatus.PARKED_TIMED : ThreadStatus.PARKED;
     }
 
     @SubstrateForeignCallTarget(stubCallingConvention = false)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/SingleThreadedMonitorSupport.java

@@ -25,6 +25,7 @@
 package com.oracle.svm.core.monitor;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
+import com.oracle.svm.core.thread.ThreadStatus;
 
 /**
  * Without support for threads, there is no need for any monitor operations.
@@ -84,7 +85,7 @@ public void notify(Object obj, boolean notifyAll) {
     }
 
     @Override
-    public int maybeAdjustNewParkStatus(int status) {
-        return status;
+    public int getParkedThreadStatus(Thread thread, boolean timed) {
+        return timed ? ThreadStatus.PARKED_TIMED : ThreadStatus.PARKED;
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaLangThreadGroupSubstitutions.java

@@ -162,7 +162,6 @@ public Object compute(MetaAccessProvider metaAccess, ResolvedJavaField original,
             return ThreadStatus.NEW;
         }
     }
-
 }
 
 @Platforms(Platform.HOSTED_ONLY.class)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java

@@ -265,7 +265,7 @@ static void initializeNewThread(
         }
         tjlt.name = name;
 
-        final Thread parent = PlatformThreads.currentThread.get();
+        final Thread parent = Thread.currentThread();
         final ThreadGroup group = ((groupArg != null) ? groupArg : parent.getThreadGroup());
 
         int priority;
@@ -366,4 +366,12 @@ public static Object getCurrentThreadLockHelper() {
         }
         return PlatformThreads.lockHelper.get();
     }
+
+    public static void blockedOn(Target_sun_nio_ch_Interruptible b) {
+        if (supportsVirtual() && isVirtual(Thread.currentThread())) {
+            VirtualThreads.singleton().blockedOn(b);
+        } else {
+            PlatformThreads.blockedOn(b);
+        }
+    }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomSupport.java

@@ -29,7 +29,6 @@
 
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.word.Pointer;
 
 public final class LoomSupport {
     private static final boolean isEnabled;
@@ -55,8 +54,8 @@ public static boolean isEnabled() {
     static final int FREEZE_PINNED_CS = 2; // critical section
     static final int FREEZE_PINNED_NATIVE = 3;
 
-    public static Pointer getBaseSP(Target_jdk_internal_vm_Continuation cont) {
-        return cont.internal.getBaseSP();
+    public static Continuation getInternalContinuation(Target_jdk_internal_vm_Continuation cont) {
+        return cont.internal;
     }
 
     private LoomSupport() {