[GR-69712] Fix a few Web Image issues.

PullRequest: graal/22154

Author: fniephaus

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/util/ReflectUtil.java

@@ -72,8 +72,15 @@ private static Optional<Method> singleAbstractMethodForInterface(Class<?> javaIn
             return Optional.empty();
         }
 
+        Method[] methods;
+        try {
+            methods = javaInterface.getMethods();
+        } catch (NoClassDefFoundError e) {
+            return Optional.empty();
+        }
+
         Method sam = null;
-        for (final Method method : javaInterface.getMethods()) {
+        for (final Method method : methods) {
             if (OBJECT_METHODS.contains(method)) {
                 // Skip the methods from the Object class.
                 continue;

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

@@ -30,27 +30,90 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
 @TargetClass(value = java.lang.StackWalker.class)
+@SuppressWarnings({"static-method", "unused"})
 final class Target_java_lang_StackWalker_Web {
 
     @Substitute
-    @SuppressWarnings({"static-method", "unused"})
     private void forEach(Consumer<? super StackFrame> action) {
         throw new UnsupportedOperationException("StackWalker.forEach");
     }
 
     @Substitute
-    @SuppressWarnings("static-method")
     private Class<?> getCallerClass() {
         throw new UnsupportedOperationException("StackWalker.getCallerClass");
     }
 
     @Substitute
-    @SuppressWarnings({"static-method", "unused"})
     private <T> T walk(Function<? super Stream<StackFrame>, ? extends T> function) {
-        throw new UnsupportedOperationException("StackWalker.walk");
+        if (SyntheticStackSupport.MAIN_STACK_FRAME == null) {
+            throw new UnsupportedOperationException("StackWalker.walk");
+        }
+        return function.apply(Stream.of(SyntheticStackSupport.MAIN_STACK_FRAME));
+    }
+}
+
+final class SyntheticStackSupport {
+    public static final StackTraceElement MAIN_STACK_TRACE_ELEMENT;
+    static final StackFrame MAIN_STACK_FRAME;
+
+    static {
+        String mainClassName = SubstrateOptions.Class.getValue();
+        String mainMethodName = SubstrateOptions.Method.getValue();
+        if (mainClassName.isEmpty() || mainMethodName.isEmpty()) {
+            MAIN_STACK_TRACE_ELEMENT = null;
+            MAIN_STACK_FRAME = null;
+        } else {
+            MAIN_STACK_TRACE_ELEMENT = new StackTraceElement(mainClassName, mainMethodName, "", 0);
+            MAIN_STACK_FRAME = new StackFrame() {
+                @Override
+                public String getClassName() {
+                    return mainClassName;
+                }
+
+                @Override
+                public String getMethodName() {
+                    return mainMethodName;
+                }
+
+                @Override
+                public Class<?> getDeclaringClass() {
+                    try {
+                        return Class.forName(mainClassName);
+                    } catch (ClassNotFoundException e) {
+                        throw new UnsupportedOperationException("getDeclaringClass in StackWalker.walk");
+                    }
+                }
+
+                @Override
+                public int getByteCodeIndex() {
+                    return 0;
+                }
+
+                @Override
+                public String getFileName() {
+                    return MAIN_STACK_TRACE_ELEMENT.getFileName();
+                }
+
+                @Override
+                public int getLineNumber() {
+                    return MAIN_STACK_TRACE_ELEMENT.getLineNumber();
+                }
+
+                @Override
+                public boolean isNativeMethod() {
+                    return false;
+                }
+
+                @Override
+                public StackTraceElement toStackTraceElement() {
+                    return MAIN_STACK_TRACE_ELEMENT;
+                }
+            };
+        }
     }
 }

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

@@ -114,15 +114,6 @@ private Throwable fillInStackTrace_WasmLM() {
     public void setStackTrace(StackTraceElement[] stackTrace) {
     }
 
-    @Substitute
-    private StackTraceElement[] getOurStackTrace() {
-        if (stackTrace != null) {
-            return stackTrace;
-        } else {
-            return new StackTraceElement[0];
-        }
-    }
-
     @Substitute
     public void printStackTrace(PrintStream s) {
         JSExceptionSupport.printStackTrace(this, s::println);
@@ -133,3 +124,12 @@ public void printStackTrace(PrintWriter w) {
         JSExceptionSupport.printStackTrace(this, w::println);
     }
 }
+
+@TargetClass(java.lang.StackTraceElement.class)
+@SuppressWarnings({"static-method", "unused"})
+final class Target_java_lang_StackTraceElement_Web {
+    @Substitute
+    static StackTraceElement[] of(Object x, int depth) {
+        return new StackTraceElement[]{SyntheticStackSupport.MAIN_STACK_TRACE_ELEMENT};
+    }
+}

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

@@ -28,6 +28,7 @@
 import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 
 import java.io.ByteArrayInputStream;
+import java.io.Console;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.AccessibleObject;
@@ -42,6 +43,7 @@
 import java.util.zip.DataFormatException;
 
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.ProcessProperties;
 
 import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.OS;
@@ -59,7 +61,6 @@
 import com.oracle.svm.webimage.platform.WebImageJSPlatform;
 import com.oracle.svm.webimage.platform.WebImagePlatform;
 import com.oracle.svm.webimage.platform.WebImageWasmGCPlatform;
-import org.graalvm.nativeimage.ProcessProperties;
 
 /*
  * Checkstyle: stop method name check
@@ -304,6 +305,11 @@ public static void arraycopy(Object src, int srcPos,
     public static String mapLibraryName(String libname) {
         return libname;
     }
+
+    @Substitute
+    public static Console console() {
+        return null;
+    }
 }
 
 @TargetClass(java.lang.Math.class)
@@ -917,6 +923,16 @@ private static long isAlive0(long pid) {
     }
 }
 
+@TargetClass(className = "java.lang.ProcessBuilder")
+@SuppressWarnings({"static-method", "unused"})
+final class Target_java_lang_ProcessBuilder_Web {
+    @Substitute
+    public Process start() throws IOException {
+        // Throw IOException instead of UnsupportedOperationException to allow fallback code to run.
+        throw new IOException("Cannot run processes on Web Image yet");
+    }
+}
+
 class IsLinux implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {