webimage: adopt VMError substitutions

Author: zapster

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/substitute/VMErrorSubstitutions.java

@@ -31,13 +31,14 @@
 
 import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.SubstrateUtil;
+import com.oracle.svm.core.annotate.AnnotateOriginal;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.guest.staging.Uninterruptible;
-import com.oracle.svm.shared.util.VMError;
 import com.oracle.svm.hosted.webimage.wasm.nodes.WasmTrapNode;
+import com.oracle.svm.shared.util.VMError;
 import com.oracle.svm.webimage.platform.WebImageWasmLMPlatform;
 import com.oracle.svm.webimage.substitute.system.Target_java_lang_Throwable_Web;
 
@@ -83,7 +84,7 @@ static void shutdown(String msg, Throwable ex) {
 @TargetClass(VMError.class)
 @Platforms(WebImageWasmLMPlatform.class)
 @SuppressWarnings("unused")
-final class Target_com_oracle_svm_core_util_VMError_Web {
+final class Target_com_oracle_svm_core_shared_VMError_Web {
 
     /*
      * These substitutions let the svm print the real message. The original VMError methods throw a
@@ -149,4 +150,12 @@ private static RuntimeException intentionallyUnimplemented() {
     private static RuntimeException unsupportedFeature(String msg) {
         throw new Error("UNSUPPORTED FEATURE: " + msg);
     }
+
+    @AnnotateOriginal
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static native void guarantee(boolean condition);
+
+    @AnnotateOriginal
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static native void guarantee(boolean condition, String msg);
 }

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasmgc/substitute/WasmGCVMErrorSubstitutions.java

@@ -28,12 +28,14 @@
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.SubstrateUtil;
+import com.oracle.svm.core.annotate.AnnotateOriginal;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.UnsupportedFeatureError;
-import com.oracle.svm.shared.util.VMError;
+import com.oracle.svm.guest.staging.Uninterruptible;
 import com.oracle.svm.hosted.webimage.wasm.debug.WasmDebug;
 import com.oracle.svm.hosted.webimage.wasm.nodes.WasmTrapNode;
+import com.oracle.svm.shared.util.VMError;
 import com.oracle.svm.webimage.platform.WebImageWasmGCPlatform;
 import com.oracle.svm.webimage.substitute.system.Target_java_lang_Throwable_Web;
 
@@ -58,7 +60,7 @@ static RuntimeException shouldNotReachHere(String msg, Throwable ex) {
 @TargetClass(VMError.class)
 @Platforms(WebImageWasmGCPlatform.class)
 @SuppressWarnings("unused")
-final class Target_com_oracle_svm_core_util_VMError_Web {
+final class Target_com_oracle_svm_shared_util_VMError_Web {
 
     @Substitute
     private static RuntimeException shouldNotReachHere(String msg) {
@@ -109,4 +111,12 @@ private static RuntimeException intentionallyUnimplemented() {
     private static RuntimeException unsupportedFeature(String msg) {
         throw new UnsupportedFeatureError(msg);
     }
+
+    @AnnotateOriginal
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static native void guarantee(boolean condition);
+
+    @AnnotateOriginal
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static native void guarantee(boolean condition, String msg);
 }

web-image/src/com.oracle.svm.webimage/src/com/oracle/svm/webimage/substitute/system/WebImageJavaLangSubstitutions.java

@@ -48,13 +48,14 @@
 import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.OS;
 import com.oracle.svm.core.SubstrateUtil;
-import com.oracle.svm.guest.staging.Uninterruptible;
+import com.oracle.svm.core.annotate.AnnotateOriginal;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystem;
 import com.oracle.svm.core.jdk.resources.ResourceStorageEntryBase;
+import com.oracle.svm.guest.staging.Uninterruptible;
 import com.oracle.svm.shared.util.VMError;
 import com.oracle.svm.webimage.functionintrinsics.JSFunctionIntrinsics;
 import com.oracle.svm.webimage.functionintrinsics.JSInternalErrors;
@@ -105,7 +106,7 @@ private static String getSystemGMTOffsetID() {
 @TargetClass(com.oracle.svm.shared.util.VMError.class)
 @Platforms(WebImageJSPlatform.class)
 @SuppressWarnings("unused")
-final class Target_com_oracle_svm_core_util_VMError_Web {
+final class Target_com_oracle_svm_core_shared_VMError_Web {
 
     /*
      * m These substitutions let the svm print the real message. The original VMError methods throw
@@ -160,6 +161,14 @@ private static RuntimeException intentionallyUnimplemented() {
     private static RuntimeException unsupportedFeature(String msg) {
         throw new Error("UNSUPPORTED FEATURE: " + msg);
     }
+
+    @AnnotateOriginal
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static native void guarantee(boolean condition);
+
+    @AnnotateOriginal
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static native void guarantee(boolean condition, String msg);
 }
 
 @TargetClass(className = "jdk.internal.misc.Unsafe")