Cleanup @NeverInline.

Author: christianhaeubl

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInline.java

@@ -39,6 +39,11 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
 public @interface NeverInline {
+    /**
+     * In some cases, we don't have proper exception edges on the compiler level at the moment (see
+     * GR-24649).
+     */
+    String CALLER_CATCHES_IMPLICIT_EXCEPTIONS = "Ensure that all exceptions can be caught, including implicit exceptions.";
 
     /**
      * Documents the reason why the annotated code must not be inlined.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.classinitialization;
 
+import static com.oracle.svm.core.NeverInline.CALLER_CATCHES_IMPLICIT_EXCEPTIONS;
+
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -419,7 +421,7 @@ private static void reachInterfaces(DynamicHub hub) {
      * {@link #initLock}. However, we want to stick as close as possible to the specification, so we
      * explicitly don't do any optimizations in that regard.
      */
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+13/src/hotspot/share/oops/instanceKlass.cpp#L1184-L1364")
     private void tryInitialize0(DynamicHub hub) {
         assert !Platform.includedIn(NATIVE_ONLY.class) || StackOverflowCheck.singleton().isYellowZoneAvailable();
@@ -590,7 +592,7 @@ private void setInitThread() {
      * thread which encounters the class being initialized, it would wrongly be considered reentrant
      * initialization and enable use of the incompletely initialized class.
      */
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     private void setInitThread0() {
         assert initThread.isNull();
         if (ContinuationSupport.isSupported() && JavaThreads.isCurrentThreadVirtual()) {
@@ -608,7 +610,7 @@ private void clearInitThread() {
         }
     }
 
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     private void clearInitThread0() {
         assert initThread == CurrentIsolate.getCurrentThread();
         initThread = Word.nullPointer();
@@ -618,7 +620,7 @@ private void clearInitThread0() {
     }
 
     /** Eagerly initialize superinterfaces that declare default methods. May throw exceptions. */
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+13/src/hotspot/share/oops/instanceKlass.cpp#L1099-L1117")
     private static void initializeSuperInterfaces(DynamicHub hub) {
         assert hub.hasDefaultMethods() : "caller should have checked this";
@@ -653,7 +655,7 @@ private static Throwable createExceptionInInitializerObject(Throwable exception)
         }
     }
 
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     private static ExceptionInInitializerError createExceptionInInitializerObject0(Throwable exception) {
         return new ExceptionInInitializerError(exception);
     }
@@ -672,7 +674,7 @@ private void setInitializationStateAndNotify(InitState state) {
         }
     }
 
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     private void setInitializationStateAndNotify0(InitState state) {
         initLock.lock();
         try {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
+import static com.oracle.svm.core.NeverInline.CALLER_CATCHES_IMPLICIT_EXCEPTIONS;
 import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 import static com.oracle.svm.core.graal.nodes.WriteCodeBaseNode.writeCurrentVMCodeBase;
 import static com.oracle.svm.core.graal.nodes.WriteCurrentVMThreadNode.writeCurrentVMThread;
@@ -385,7 +386,7 @@ private static int initializeIsolateInterruptibly0(CEntryPointCreateIsolateParam
         }
     }
 
-    @NeverInline("GR-24649")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     private static int initializeIsolateInterruptibly1(CEntryPointCreateIsolateParameters parameters) {
         /* Initialize the isolate id (the id is needed for isolate teardown). */
         long initStateAddr = FIRST_ISOLATE_INIT_STATE.get().rawValue();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandler.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.heap;
 
+import static com.oracle.svm.core.NeverInline.CALLER_CATCHES_IMPLICIT_EXCEPTIONS;
 import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 
 import java.lang.ref.Reference;
@@ -69,7 +70,7 @@ public static void processPendingReferencesInRegularThread() {
         }
     }
 
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     static void processCleaners() {
         // Note: (sun.misc|jdk.internal).Cleaner objects are invoked in pending reference processing
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.heap;
 
+import static com.oracle.svm.core.NeverInline.CALLER_CATCHES_IMPLICIT_EXCEPTIONS;
 import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
 import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
@@ -179,12 +180,12 @@ public static void initializeLocking() {
         MonitorSupport.singleton().ensureInitialized(processPendingLock);
     }
 
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     public static void waitForPendingReferences() throws InterruptedException {
         Heap.getHeap().waitForReferencePendingList();
     }
 
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     @SuppressFBWarnings(value = "NN_NAKED_NOTIFY", justification = "Notifies on progress, not a specific state change.")
     public static void processPendingReferences() {
         /*

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Cleaner.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.heap;
 
+import static com.oracle.svm.core.NeverInline.CALLER_CATCHES_IMPLICIT_EXCEPTIONS;
+
 import java.lang.ref.Cleaner;
 import java.lang.ref.ReferenceQueue;
 
@@ -50,7 +52,7 @@ public final class Target_java_lang_ref_Cleaner {
 @TargetClass(className = "java.lang.ref.Cleaner$Cleanable")
 final class Target_java_lang_ref_Cleaner_Cleanable {
     @AnnotateOriginal
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     native void clean();
 }
 
@@ -96,7 +98,7 @@ final class Target_jdk_internal_ref_PhantomCleanable {
     int index;
 
     @AnnotateOriginal
-    @NeverInline("Ensure that every exception can be caught, including implicit exceptions.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     /* final */ native void clean();
 }
 

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompilationExceptionDispatch.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.graal.isolated;
 
+import static com.oracle.svm.core.NeverInline.CALLER_CATCHES_IMPLICIT_EXCEPTIONS;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 
@@ -111,7 +113,7 @@ protected final int handleException(Throwable t) {
         return 0;
     }
 
-    @NeverInline("Ensure that an exception thrown from this method can always be caught.")
+    @NeverInline(CALLER_CATCHES_IMPLICIT_EXCEPTIONS)
     private boolean dispatchExceptionToOtherIsolate(Throwable t) {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         try (PrintWriter pw = new PrintWriter(os)) {