[GR-64319] Substitutions for basic file operations

PullRequest: graal/20932

Author: Elia Trachsel

ci/common.jsonnet

@@ -262,6 +262,14 @@ local common_json = import "../common.json";
       ] else []),
     },
 
+    espresso:: {
+      downloads+: {
+       EXTRA_JAVA_HOMES+: {
+                pathlist+: [jdks_data["oraclejdk21"], jdks_data["oraclejdk25"]],
+           }
+       }
+    },
+
     sulong:: self.cmake + {
       packages+: if self.os == "windows" then {
         msvc_source: "==14.0",

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.58.9",
+  "mx_version": "7.59.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java

@@ -112,6 +112,10 @@ public static JavaVersion forVersion(String version) {
         }
     }
 
+    public Runtime.Version toRunTimeVersion() {
+        return Runtime.Version.parse(toString());
+    }
+
     private static JavaVersion forVersion(Runtime.Version version) {
         return forVersion(version.feature());
     }
@@ -184,6 +188,10 @@ public boolean java20OrEarlier() {
         return version <= 20;
     }
 
+    public boolean java21Or25() {
+        return version == 21 || version == 25;
+    }
+
     public boolean java21OrLater() {
         return version >= 21;
     }

espresso/ci/ci_common/common.jsonnet

@@ -15,7 +15,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   local that = self,
 
   // platform-specific snippets
-  common: graal_common.deps.sulong + {
+  common: graal_common.deps.sulong + graal_common.deps.espresso + {
     python_version: '3',
     environment+: {
       GRAALVM_CHECK_EXPERIMENTAL_OPTIONS: "true",

espresso/mx.espresso/suite.py

@@ -101,7 +101,42 @@
             "sourceDirs": ["src"],
             # Contains classes in sun.nio.* that only compile with javac.
             "forceJavac": "true",
-            "javaCompliance": "8+",
+            "javaCompliance": "21+",
+            "patchModule": "java.base",
+            "checkPackagePrefix": False,  # Contains classes in java.io and sun.nio.
+            "checkstyle": "com.oracle.truffle.espresso",
+        },
+
+        "com.oracle.truffle.espresso.io.jdk21": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "dependencies": [
+                "com.oracle.truffle.espresso.io",
+            ],
+            "overlayTarget": "com.oracle.truffle.espresso.io",
+            # Contains classes in sun.nio.* that only compile with javac.
+            "forceJavac": "true",
+            "multiReleaseJarVersion": "21",
+            "patchModule": "java.base",
+            "javaCompliance": "21",
+            "checkPackagePrefix": False,  # Contains classes in java.io and sun.nio.
+            "checkstyle": "com.oracle.truffle.espresso",
+        },
+
+        "com.oracle.truffle.espresso.io.jdk25": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "dependencies": [
+                "com.oracle.truffle.espresso.io",
+            ],
+            # GR-47124 spotbugs does not support jdk25
+            "spotbugs": "false",
+            "overlayTarget": "com.oracle.truffle.espresso.io",
+            # Contains classes in sun.nio.* that only compile with javac.
+            "forceJavac": "true",
+            "multiReleaseJarVersion": "25",
+            "patchModule": "java.base",
+            "javaCompliance": "25",
             "checkPackagePrefix": False,  # Contains classes in java.io and sun.nio.
             "checkstyle": "com.oracle.truffle.espresso",
         },

espresso/src/com.oracle.truffle.espresso.io.jdk21/src/sun/nio/fs/NewFileChannelHelper.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023, 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.
+ *
+ * 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 sun.nio.fs;
+
+import java.io.Closeable;
+import java.io.FileDescriptor;
+import java.nio.channels.FileChannel;
+
+import sun.nio.ch.FileChannelImpl;
+
+public class NewFileChannelHelper {
+    public static FileChannel open(FileDescriptor fd, String path,
+                    boolean readable, boolean writable,
+                    boolean sync, boolean direct, Closeable parent) {
+        return FileChannelImpl.open(fd, path, readable, writable, direct, parent);
+    }
+}

espresso/src/com.oracle.truffle.espresso.io.jdk25/src/sun/nio/fs/NewFileChannelHelper.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023, 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.
+ *
+ * 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 sun.nio.fs;
+
+import java.io.Closeable;
+import java.io.FileDescriptor;
+import java.nio.channels.FileChannel;
+
+import sun.nio.ch.FileChannelImpl;
+
+public class NewFileChannelHelper {
+    public static FileChannel open(FileDescriptor fd, String path,
+                    boolean readable, boolean writable,
+                    boolean sync, boolean direct, Closeable parent) {
+        return FileChannelImpl.open(fd, path, readable, writable, sync, direct, parent);
+    }
+}

espresso/src/com.oracle.truffle.espresso.io/src/java/io/TruffleFileSystem.java

@@ -27,9 +27,7 @@
  * <p>
  * Its native methods are provided by Espresso's custom {@code libjava} implementation.
  * <p>
- * This file must be compatible with all Java versions supported by Espresso, strict Java 8
- * compatibility is required.
- *
+ * This file must be compatible with 21+.
  */
 final class TruffleFileSystem extends FileSystem {
 
@@ -73,7 +71,13 @@ public String getDefaultParent() {
 
     @Override
     public String fromURIPath(String path) {
-        return fromURIPath0(path);
+        // copy pasted from UnixFileSystem
+        String p = path;
+        if (p.endsWith("/") && (p.length() > 1)) {
+            // "/foo/" --> "/foo", but "/" --> "/"
+            p = p.substring(0, p.length() - 1);
+        }
+        return p;
     }
 
     @Override

espresso/src/com.oracle.truffle.espresso.io/src/sun/nio/ch/FileDispatcherImpl.java

@@ -34,8 +34,7 @@
  * descriptors used this class are purely virtual and should not be passed down to native code.
  *
  * <p>
- * This file must be compatible with all Java versions supported by Espresso, strict Java 8
- * compatibility is required.
+ * This file must be compatible with 21+
  */
 final class FileDispatcherImpl extends sun.nio.ch.FileDispatcher {
 

espresso/src/com.oracle.truffle.espresso.io/src/sun/nio/fs/DefaultFileSystemProvider.java

@@ -28,8 +28,7 @@
  * Replaces JDK's own {@link DefaultFileSystemProvider} to link to a Truffle-based
  * {@code FileSystem}.
  * <p>
- * This file must be compatible with all Java versions supported by Espresso, strict Java 8
- * compatibility is required.
+ * This file must be compatible with 21+.
  */
 public final class DefaultFileSystemProvider {
     private static final TruffleFileSystemProvider INSTANCE = new TruffleFileSystemProvider();