Remove JDK21OrEarlier from Web Image

Author: patrick96

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

@@ -52,8 +52,6 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
-import com.oracle.svm.core.jdk.JDK21OrEarlier;
-import com.oracle.svm.core.jdk.JDKLatest;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.webimage.fs.WebImageNIOFileSystemProvider;
 import com.oracle.svm.webimage.functionintrinsics.JSFunctionIntrinsics;
@@ -175,7 +173,6 @@ private long length0() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     @SuppressWarnings({"static-method"})
     private boolean isRegularFile() {
         return !fd.equals(FileDescriptor.in);
@@ -414,13 +411,6 @@ public int read(ByteBuffer var1) throws IOException {
     }
 
     @Substitute
-    @TargetElement(name = "open", onlyWith = JDK21OrEarlier.class)
-    public static FileChannel openJDK21(FileDescriptor fd, String path, boolean readable, boolean writable, boolean direct, Closeable parent) {
-        throw new UnsupportedOperationException("FileChannelImpl.open");
-    }
-
-    @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     public static FileChannel open(FileDescriptor fd, String path, boolean readable, boolean writable, boolean sync, boolean direct, Closeable parent) {
         throw new UnsupportedOperationException("FileChannelImpl.open");
     }

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

@@ -25,66 +25,18 @@
 
 package com.oracle.svm.webimage.substitute.system;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 import java.util.function.BooleanSupplier;
 
 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.JDK21OrEarlier;
 import com.oracle.svm.webimage.substitute.WebImageUtil;
 
 import sun.security.provider.NativePRNG;
 
 public class WebImageSecuritySubstitutions {
 }
 
-@TargetClass(value = AccessController.class, onlyWith = JDK21OrEarlier.class)
-final class Target_java_security_AccessController_Web {
-
-    /**
-     * We need this substitution to avoid doing a stack walk.
-     */
-    @Substitute
-    static <T> T doPrivileged(PrivilegedAction<T> action,
-                    @SuppressWarnings("unused") AccessControlContext context, @SuppressWarnings("unused") Permission... perms) {
-        return action.run();
-    }
-
-    @Substitute
-    static AccessControlContext getStackAccessControlContext() {
-        return null;
-    }
-
-    @Substitute
-    @SuppressWarnings({"deprecation", "unused"}) // deprecated starting JDK 17
-    static <T> T executePrivileged(PrivilegedExceptionAction<T> action, AccessControlContext context, Class<?> caller) throws Throwable {
-        if (action == null) {
-            throw new NullPointerException("Null action");
-        }
-
-        if (action == null) {
-            throw new NullPointerException("Null action");
-        }
-
-        return action.run();
-    }
-
-    @Substitute
-    @SuppressWarnings({"deprecation", "unused"}) // deprecated starting JDK 17
-    static <T> T executePrivileged(PrivilegedAction<T> action, AccessControlContext context, Class<?> caller) throws Throwable {
-        if (action == null) {
-            throw new NullPointerException("Null action");
-        }
-
-        return action.run();
-    }
-}
-
 // Windows does not have a NativePRNG implementation
 @TargetClass(value = NativePRNG.class, onlyWith = IsUnix.class)
 @SuppressWarnings("all")

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

@@ -32,9 +32,6 @@
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.annotate.TargetElement;
-import com.oracle.svm.core.jdk.JDK21OrEarlier;
-import com.oracle.svm.core.jdk.JDKLatest;
 
 /*
  * Checkstyle: stop method name check
@@ -83,12 +80,6 @@ static void unlink0(long l) {
         throw new UnsupportedOperationException("UnixNativeDispatcher.unlink");
     }
 
-    @Substitute
-    @TargetElement(onlyWith = JDK21OrEarlier.class)
-    static void futimes(int fd, long times0, long times1) {
-        throw new UnsupportedOperationException("UnixNativeDispatcher.futimes");
-    }
-
     @Substitute
     static void fchmod(int fd, int mode) {
         throw new UnsupportedOperationException("UnixNativeDispatcher.fchmod");
@@ -160,31 +151,11 @@ static int fgetxattr0(int filedes, long nameAddress, long valueAddress, int valu
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDKLatest.class, name = "access0")
-    static int access0JDK23(long pathAddress, int amode) {
-        throw new UnsupportedOperationException("UnixNativeDispatcher.access0");
-    }
-
-    @Substitute
-    @TargetElement(onlyWith = JDK21OrEarlier.class)
-    static void access0(long pathAddress, int amode) {
+    static int access0(long pathAddress, int amode) {
         throw new UnsupportedOperationException("UnixNativeDispatcher.access0");
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK21OrEarlier.class)
-    static boolean exists0(long pathAddress) {
-        throw new UnsupportedOperationException("UnixNativeDispatcher.exists0");
-    }
-
-    @Substitute
-    @TargetElement(onlyWith = JDK21OrEarlier.class)
-    static void utimes0(long pathAddress, long times0, long times1) {
-        throw new UnsupportedOperationException("UnixNativeDispatcher.utimes0");
-    }
-
-    @Substitute
-    @TargetElement(onlyWith = JDKLatest.class)
     private static void utimensat0(int fd, long pathAddress, long times0, long times1, int flags) {
         throw new UnsupportedOperationException("UnixNativeDispatcher.utimensat0");
     }
@@ -219,12 +190,6 @@ static void mknod0(long pathAddress, int mode, long dev) {
         throw new UnsupportedOperationException("UnixNativeDispatcher.mknod0");
     }
 
-    @Substitute
-    @TargetElement(onlyWith = JDK21OrEarlier.class)
-    static void lutimes0(long pathAddress, long times0, long times1) {
-        throw new UnsupportedOperationException("UnixNativeDispatcher.lutimes0");
-    }
-
     @Substitute
     static void lchown0(long pathAddress, int uid, int gid) {
         throw new UnsupportedOperationException("UnixNativeDispatcher.lchown0");