[GR-69811] Backport to 25.0: Mark compiler threads as crashed in both isolates.

PullRequest: graal/22263

Author: OracleLabsAutomation

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Pthread.java

@@ -83,9 +83,6 @@ public interface pthread_key_tPointer extends PointerBase {
         pthread_key_t read();
     }
 
-    @CConstant
-    public static native int PTHREAD_KEYS_MAX();
-
     @CConstant
     public static native int PTHREAD_CREATE_JOINABLE();
 
@@ -98,9 +95,6 @@ public interface pthread_key_tPointer extends PointerBase {
     @CFunction(value = "pthread_create", transition = Transition.NO_TRANSITION)
     public static native int pthread_create_no_transition(pthread_tPointer newthread, pthread_attr_t attr, WordBase start_routine, WordBase arg);
 
-    @CFunction
-    public static native int pthread_join(pthread_t th, WordPointer thread_return);
-
     @CFunction(value = "pthread_join", transition = Transition.NO_TRANSITION)
     public static native int pthread_join_no_transition(pthread_t th, WordPointer thread_return);
 
@@ -188,9 +182,6 @@ public interface pthread_key_tPointer extends PointerBase {
     @CFunction(transition = Transition.NO_TRANSITION)
     public static native int pthread_condattr_destroy(pthread_condattr_t attr);
 
-    @CFunction
-    public static native int pthread_kill(pthread_t thread, Signal.SignalEnum sig);
-
     @CFunction(transition = Transition.NO_TRANSITION)
     public static native int pthread_key_create(pthread_key_tPointer key, PointerBase keyDestructor);
 
@@ -203,4 +194,8 @@ public interface pthread_key_tPointer extends PointerBase {
     @CFunction(transition = Transition.NO_TRANSITION)
     public static native VoidPointer pthread_getspecific(pthread_key_t key);
 
+    public static class NoTransition {
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int pthread_exit(VoidPointer retval);
+    }
 }

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ClientHandle.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/ClientHandle.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
 
 /**
  * A handle to an object of type T that exists in the {@linkplain ClientIsolateThread compilation

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ClientIsolateThread.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/ClientIsolateThread.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
 
 import org.graalvm.nativeimage.IsolateThread;
 

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/CompilerHandle.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/CompilerHandle.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
 
 /**
  * A handle to an object of type T that exists in the {@linkplain CompilerIsolateThread compilation

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/CompilerIsolateThread.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/CompilerIsolateThread.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
 
 import org.graalvm.nativeimage.IsolateThread;
 

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompilationExceptionDispatch.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/IsolatedCompilationExceptionDispatch.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
@@ -37,8 +37,6 @@
 import com.oracle.svm.core.c.function.CEntryPointOptions;
 import com.oracle.svm.core.threadlocal.FastThreadLocalFactory;
 import com.oracle.svm.core.threadlocal.FastThreadLocalObject;
-import com.oracle.svm.hosted.code.CEntryPointCallStubMethod;
-import com.oracle.svm.hosted.code.CEntryPointJavaCallStubMethod;
 
 import jdk.graal.compiler.core.common.GraalBailoutException;
 
@@ -83,13 +81,13 @@ protected static void throwPendingException() {
      * entry point.
      * <p>
      * Note that the caller isolate cannot have called from uninterruptible code because
-     * {@link CEntryPointJavaCallStubMethod} does thread state transitions that require a safepoint
+     * {@code CEntryPointJavaCallStubMethod} does thread state transitions that require a safepoint
      * check, so this method calling it back to dispatch the exception in interruptible code is
      * considered acceptable.
      * <p>
      * Our (callee) entry point might intend to execute only uninterruptible code save for this
      * exception handler, but as of writing this, isolated compilation nowhere requires relying on
-     * that and {@link CEntryPointCallStubMethod} also does state transitions and safepoint checks.
+     * that and {@code CEntryPointCallStubMethod} also does state transitions and safepoint checks.
      * <p>
      * Also note that an exception's stack trace contains all its isolate's frames up until the last
      * entry frame, but not another isolate's frames in between. When an exception is propagated

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/IsolatedCompileClient.java

@@ -22,7 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
+
+import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.ObjectHandle;
@@ -102,6 +104,7 @@ public IsolatedCompileClient(CompilerIsolateThread compiler) {
         this.compiler = compiler;
     }
 
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public CompilerIsolateThread getCompiler() {
         return compiler;
     }
@@ -113,7 +116,7 @@ protected IsolateThread getOtherIsolate() {
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-    ThreadLocalHandles<ObjectHandle> getHandleSet() {
+    public ThreadLocalHandles<ObjectHandle> getHandleSet() {
         return handles;
     }
 

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/IsolatedCompileContext.java

@@ -22,7 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.graal.isolated;
+package com.oracle.svm.core.graal.isolated;
+
+import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.ObjectHandle;
@@ -116,6 +118,7 @@ public IsolatedCompileContext(ClientIsolateThread clientIsolate) {
         this.client = clientIsolate;
     }
 
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public ClientIsolateThread getClient() {
         return client;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/isolated/IsolatedHandle.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.graal.isolated;
+
+import org.graalvm.nativeimage.ObjectHandle;
+
+/**
+ * An object handle for isolated compilation with added static type information.
+ *
+ * @param <T> The type of the object referenced by the handle.
+ */
+public interface IsolatedHandle<T> extends ObjectHandle {
+}

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

@@ -40,12 +40,15 @@
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.NeverInline;
+import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.c.function.CEntryPointErrors;
 import com.oracle.svm.core.c.function.CFunctionOptions;
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.graal.isolated.IsolatedCompileClient;
+import com.oracle.svm.core.graal.isolated.IsolatedCompileContext;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.VMOperationInfos;
 import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
@@ -960,7 +963,23 @@ public static void preventSafepoints() {
          */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void markThreadAsCrashed() {
-            // It would be nice if we could retire the TLAB here but that wouldn't work reliably.
+            if (SubstrateOptions.supportCompileInIsolates()) {
+                /*
+                 * Threads that are used for isolated compilation may be attached to both the main
+                 * and a compilation isolate. So, mark it as crashed in both isolates.
+                 */
+                IsolatedCompileContext compileContext = IsolatedCompileContext.get();
+                if (compileContext != null) {
+                    safepointBehaviorTL.setVolatile(compileContext.getClient(), THREAD_CRASHED);
+                }
+
+                IsolatedCompileClient compileClient = IsolatedCompileClient.get();
+                if (compileClient != null) {
+                    safepointBehaviorTL.setVolatile(compileClient.getCompiler(), THREAD_CRASHED);
+                }
+            }
+
+            /* It would be nice if we could retire the TLAB here but that wouldn't work reliably. */
             safepointBehaviorTL.setVolatile(THREAD_CRASHED);
         }