[GR-49718] Update JVMCI to 22+20-jvmci-b02.

OracleLabsAutomation · zapster · commit dcd4224d0ca8 · 2023-11-03T10:02:27.000Z
PullRequest: graal/15889
diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.52.0",
+  "mx_version": "6.53.2",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -42,13 +42,13 @@
     "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b22-debug", "platformspecific": true },
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b22-sulong", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "22",      "build_id": "18", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-22+18-jvmci-b03", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-22+18-jvmci-b03-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-22+18-jvmci-b03-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-22+18-jvmci-b03", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-22+18-jvmci-b03-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-22+18-jvmci-b03-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "22",      "build_id": "20", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-22+20-jvmci-b02", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-22+20-jvmci-b02-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-22+20-jvmci-b02-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-22+20-jvmci-b02", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-22+20-jvmci-b02-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-22+20-jvmci-b02-sulong", "platformspecific": true }
   },
 
   "eclipse": {
diff --git a/compiler/ci/ci_common/gate.jsonnet b/compiler/ci/ci_common/gate.jsonnet
@@ -204,12 +204,14 @@
   local gates = {
     "gate-compiler-test-labsjdk-latest-linux-amd64": t("1:00:00") + c.mach5_target,
     "gate-compiler-test-labsjdk-latest-linux-aarch64": t("1:50:00") + s.avoid_xgene3,
-    "gate-compiler-test-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
+    # JDK latest only works on MacOS Ventura (GR-49652)
+    # "gate-compiler-test-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
     "gate-compiler-test-labsjdk-latest-darwin-aarch64": t("1:00:00"),
     "gate-compiler-test-labsjdk-latest-windows-amd64": t("1:30:00"),
     "gate-compiler-test_zgc-labsjdk-latest-linux-amd64": t("1:00:00") + c.mach5_target,
     "gate-compiler-test_zgc-labsjdk-latest-linux-aarch64": t("1:50:00") + s.avoid_xgene3,
-    "gate-compiler-test_zgc-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
+    # JDK latest only works on MacOS Ventura (GR-49652)
+    # "gate-compiler-test_zgc-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
     "gate-compiler-test_zgc-labsjdk-latest-darwin-aarch64": t("1:00:00"),
 
     # Style jobs need to stay on a JDK compatible with all the style
@@ -230,7 +232,8 @@
     "gate-compiler-truffle_xcomp-labsjdk-latest-linux-amd64": t("1:30:00"),
     "gate-compiler-truffle_xcomp_zgc-labsjdk-latest-linux-amd64": t("1:30:00"),
 
-    "gate-compiler-bootstrap_lite-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target,
+    # JDK latest only works on MacOS Ventura (GR-49652)
+    # "gate-compiler-bootstrap_lite-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target,
 
     "gate-compiler-bootstrap_full-labsjdk-latest-linux-amd64": s.many_cores + c.mach5_target,
     "gate-compiler-bootstrap_full_zgc-labsjdk-latest-linux-amd64": s.many_cores + c.mach5_target
diff --git a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckGraalIntrinsics.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckGraalIntrinsics.java
@@ -28,6 +28,7 @@
 import static jdk.graal.compiler.hotspot.HotSpotGraalServices.isIntrinsicSupportedByC2;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -62,7 +63,7 @@
  * Checks the intrinsics implemented by Graal against the set of intrinsics declared by HotSpot. The
  * purpose of this test is to detect when new intrinsics are added to HotSpot and process them
  * appropriately in Graal. This will be achieved by working through
- * {@link UnimplementedGraalIntrinsics#toBeInvestigated} and * either implementing the intrinsic or
+ * {@link UnimplementedGraalIntrinsics#toBeInvestigated} and either implementing the intrinsic or
  * moving it to {@link UnimplementedGraalIntrinsics#ignore}.
  */
 public class CheckGraalIntrinsics extends GraalTest {
@@ -145,7 +146,7 @@ public interface Refiner {
 
     @Test
     @SuppressWarnings("try")
-    public void test() throws ClassNotFoundException {
+    public void test() throws ClassNotFoundException, NoSuchFieldException {
         HotSpotProviders providers = rt.getHostBackend().getProviders();
         Plugins graphBuilderPlugins = providers.getGraphBuilderPlugins();
         InvocationPlugins invocationPlugins = graphBuilderPlugins.getInvocationPlugins();
@@ -162,6 +163,7 @@ public void test() throws ClassNotFoundException {
         List<String> mischaracterizedAsIgnored = new ArrayList<>();
         List<String> notAvailableYetIntrinsified = new ArrayList<>();
 
+        Field toBeInvestigated = UnimplementedGraalIntrinsics.class.getDeclaredField("toBeInvestigated");
         for (VMIntrinsicMethod intrinsic : intrinsics) {
             ResolvedJavaMethod method = resolveIntrinsic(providers.getMetaAccess(), intrinsic);
             if (method == null) {
@@ -196,6 +198,8 @@ public void test() throws ClassNotFoundException {
             Collections.sort(missing);
             String missingString = missing.stream().map(s -> '"' + s + '"').collect(Collectors.joining(String.format(",%n    ")));
             errorMsgBuf.format("missing Graal intrinsics for:%n    %s%n", missingString);
+            errorMsgBuf.format("To fix, modify the %s constructor to add them to %s.%n",
+                            UnimplementedGraalIntrinsics.class.getSimpleName(), toBeInvestigated);
         }
         if (!mischaracterizedAsToBeInvestigated.isEmpty()) {
             Collections.sort(mischaracterizedAsToBeInvestigated);
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
@@ -48,7 +48,7 @@ public final class JVMCIVersionCheck {
      */
     private static final Map<String, Version> JVMCI_MIN_VERSIONS = Map.of(
                     "21", new Version(23, 1, 22),
-                    "22", new Version("22+18", 3));
+                    "22", new Version("22+20", 2));
 
     private static final int NA = 0;
     /**
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java
@@ -116,8 +116,11 @@ public UnimplementedGraalIntrinsics() {
                         "jdk/jfr/internal/JVM.counterTime()J",
                         "jdk/jfr/internal/JVM.getEventWriter()Ljdk/jfr/internal/event/EventWriter;");
 
-        // JDK-8223347: Integration of Vector API (Incubator)
         add(toBeInvestigated, // @formatter:off
+                        // JDK-8309130: x86_64 AVX512 intrinsics for Arrays.sort methods (GR-48679)
+                        "java/util/DualPivotQuicksort.partition(Ljava/lang/Class;Ljava/lang/Object;JIIIILjava/util/DualPivotQuicksort$PartitionOperation;)[I",
+                        "java/util/DualPivotQuicksort.sort(Ljava/lang/Class;Ljava/lang/Object;JIILjava/util/DualPivotQuicksort$SortOperation;)V",
+                        // JDK-8223347: Integration of Vector API
                         "jdk/internal/vm/vector/VectorSupport.compressExpandOp(ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;ILjdk/internal/vm/vector/VectorSupport$Vector;Ljdk/internal/vm/vector/VectorSupport$VectorMask;Ljdk/internal/vm/vector/VectorSupport$CompressExpandOperation;)Ljdk/internal/vm/vector/VectorSupport$VectorPayload;",
                         jdk == 21 ? "jdk/internal/vm/vector/VectorSupport.extract(Ljava/lang/Class;Ljava/lang/Class;ILjdk/internal/vm/vector/VectorSupport$Vector;ILjdk/internal/vm/vector/VectorSupport$VecExtractOp;)J":
                                     "jdk/internal/vm/vector/VectorSupport.extract(Ljava/lang/Class;Ljava/lang/Class;ILjdk/internal/vm/vector/VectorSupport$VectorPayload;ILjdk/internal/vm/vector/VectorSupport$VecExtractOp;)J",
diff --git a/sdk/ci/ci.jsonnet b/sdk/ci/ci.jsonnet
@@ -20,7 +20,9 @@
   builds: [
     common.linux_amd64  + common.oraclejdkLatest + sdk_gate + common.deps.eclipse + common.deps.jdt,
     common.linux_amd64  + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt + common.mach5_target,
-    common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,
+    # JDK latest only works on MacOS Ventura (GR-49652)
+    # common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,
+    common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate,
     common.darwin_amd64 + common.oraclejdk21 + sdk_gate + common.mach5_target,
   ]
 }
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "6.52.0",
+  "mxversion": "6.53.2",
   "name" : "sdk",
   "version" : "24.0.0",
   "release" : False,
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -691,6 +691,8 @@
             "checkstyle": "com.oracle.svm.hosted",
             "workingSets": "SVM",
             "jacoco" : "include",
+            # disable SpotBugs as long JDK 22 is unsupported [GR-49566]
+            "spotbugs" : "false",
         },
 
         "com.oracle.svm.hosted.foreign": {
@@ -719,6 +721,8 @@
             "checkstyle": "com.oracle.svm.hosted",
             "workingSets": "SVM",
             "jacoco" : "include",
+            # disable SpotBugs as long JDK 22 is unsupported [GR-49566]
+            "spotbugs" : "false",
         },
 
         # Native libraries below explicitly set _FORTIFY_SOURCE to 0. This constant controls how glibc handles some
diff --git a/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_java_lang_foreign_SymbolLookup.java b/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_java_lang_foreign_SymbolLookup.java
@@ -49,6 +49,7 @@
 import com.oracle.svm.core.jdk.Target_java_lang_Module;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import jdk.internal.foreign.MemorySessionImpl;
 import jdk.internal.foreign.Utils;
 import jdk.internal.loader.NativeLibrary;
@@ -134,7 +135,12 @@ static void ensureNativeAccess(Class<?> currentClass, Class<?> owner, String met
          */
         Target_java_lang_Module module = SubstrateUtil.cast(currentClass != null ? currentClass.getModule() : ClassLoader.getSystemClassLoader().getUnnamedModule(),
                         Target_java_lang_Module.class);
-        module.ensureNativeAccess(owner, methodName);
+        if (JavaVersionUtil.JAVA_SPEC <= 21) {
+            module.ensureNativeAccess(owner, methodName);
+        } else {
+            module.ensureNativeAccess(owner, methodName, currentClass);
+        }
+
     }
 
     static <Z> LookupNativeLibraries createNativeLibraries(BiConsumer<LookupNativeLibraries, Z> loadLibraryFunc, List<Z> libDescs) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_Module.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_Module.java
@@ -35,14 +35,20 @@
 import com.oracle.svm.core.annotate.Alias;
 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.resources.ResourceStorageEntry;
 
 @SuppressWarnings("unused")
 @TargetClass(value = java.lang.Module.class)
 public final class Target_java_lang_Module {
     @Alias
+    @TargetElement(onlyWith = JDK21OrEarlier.class)
     public native void ensureNativeAccess(Class<?> owner, String methodName);
 
+    @Alias
+    @TargetElement(onlyWith = JDK22OrLater.class)
+    public native void ensureNativeAccess(Class<?> owner, String methodName, Class<?> currentClass);
+
     @SuppressWarnings("static-method")
     @Substitute
     private InputStream getResourceAsStream(String resourceName) {
diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsConfigurationParser.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsConfigurationParser.java
@@ -37,6 +37,10 @@
 import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport;
 
 import com.oracle.svm.core.configure.ConfigurationParser;
+import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.util.ReflectionUtil;
+
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 @Platforms(Platform.HOSTED_ONLY.class)
 public class ForeignFunctionsConfigurationParser extends ConfigurationParser {
@@ -99,10 +103,20 @@ private List<Linker.Option> parseOptions(Object options) {
         }
         if (map.containsKey(DOWNCALL_OPTION_TRIVIAL)) {
             if (asBoolean(map.get(DOWNCALL_OPTION_TRIVIAL, ""), DOWNCALL_OPTION_TRIVIAL)) {
-                res.add(Linker.Option.isTrivial());
+                res.add(OPTION_CRITICAL);
             }
         }
 
         return res;
     }
+
+    private static final Linker.Option OPTION_CRITICAL;
+
+    static {
+        try {
+            OPTION_CRITICAL = (Linker.Option) ReflectionUtil.lookupMethod(Linker.Option.class, JavaVersionUtil.JAVA_SPEC >= 22 ? "critical" : "isTrivial").invoke(null);
+        } catch (ReflectiveOperationException ex) {
+            throw VMError.shouldNotReachHere(ex);
+        }
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java
@@ -38,6 +38,8 @@
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.jdk.JNIRegistrationUtil;
 
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
+
 /**
  * Registration of classes, methods, and fields accessed via JNI by C code of the JDK.
  */
@@ -144,9 +146,12 @@ private static void registerUnixNativeDispatcherInit(DuringAnalysisAccess a) {
         RuntimeJNIAccess.register(fields(a, "sun.nio.fs.UnixFileAttributes",
                         "st_mode", "st_ino", "st_dev", "st_rdev", "st_nlink", "st_uid", "st_gid", "st_size",
                         "st_atime_sec", "st_atime_nsec", "st_mtime_sec", "st_mtime_nsec", "st_ctime_sec", "st_ctime_nsec"));
-        if (isDarwin()) {
+        if (isDarwin() || JavaVersionUtil.JAVA_SPEC >= 22 && isLinux()) {
             RuntimeJNIAccess.register(fields(a, "sun.nio.fs.UnixFileAttributes", "st_birthtime_sec"));
         }
+        if (JavaVersionUtil.JAVA_SPEC >= 22 && isLinux()) {
+            RuntimeJNIAccess.register(fields(a, "sun.nio.fs.UnixFileAttributes", "st_birthtime_nsec"));
+        }
 
         RuntimeJNIAccess.register(clazz(a, "sun.nio.fs.UnixFileStoreAttributes"));
         RuntimeJNIAccess.register(fields(a, "sun.nio.fs.UnixFileStoreAttributes", "f_frsize", "f_blocks", "f_bfree", "f_bavail"));
diff --git a/sulong/ci/ci.jsonnet b/sulong/ci/ci.jsonnet
@@ -39,8 +39,9 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     sc.weekly + $.sulong + sc.labsjdkLatest + sc.linux_amd64 + sc.llvm6 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "weekly-sulong-basic-nwcc-llvm-v60-jdk-latest-linux-amd64" },
     sc.weekly + $.sulong + sc.labsjdkLatest + sc.linux_amd64 + sc.llvm8 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "weekly-sulong-basic-nwcc-llvm-v80-jdk-latest-linux-amd64" },
 
-    sc.weekly + $.sulong + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvm4 + sc.gateTags(basicTags) + { name: "weekly-sulong-basic-nwcc-llvm-v40-jdk-latest-darwin-amd64", timelimit: "0:45:00" },
-    sc.gate + $.sulong + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["!darwin_bigsur", "ram16gb"] },
+    # JDK latest only works on MacOS Ventura (GR-49652)
+    # sc.weekly + $.sulong + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvm4 + sc.gateTags(basicTags) + { name: "weekly-sulong-basic-nwcc-llvm-v40-jdk-latest-darwin-amd64", timelimit: "0:45:00" },
+    # sc.gate + $.sulong + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["!darwin_bigsur", "ram16gb"] },
 
     sc.gate + $.sulong + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk-latest-linux-amd64" },
     sc.gate + $.sulong + sc.labsjdk21 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk21-linux-amd64" },
@@ -67,19 +68,22 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     ],
     [
       [sc.linux_amd64,    [sc.labsjdkLatest]],
-      [sc.darwin_amd64,   [sc.labsjdkLatest]],
+      # JDK latest only works on MacOS Ventura (GR-49652)
+      # [sc.darwin_amd64,   [sc.labsjdkLatest]],
       [sc.windows_amd64 + { capabilities+: ["windows_server_2016"] /* work around native-image bug GR-48515 */ },  [sc.labsjdkLatest]],
       [sc.linux_aarch64,  [sc.labsjdkLatest]],
       [sc.darwin_aarch64, [sc.labsjdkLatest]],
     ],
     [
       { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-amd64",    timelimit: "1:00:00" },
-      { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-darwin-amd64",  timelimit: "1:00:00", targets: [] } + sc.daily,
+      # JDK latest only works on MacOS Ventura (GR-49652)
+      # { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-darwin-amd64",  timelimit: "1:00:00", targets: [] } + sc.daily,
       { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-windows-amd64",  timelimit: "1:00:00" },
       { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-aarch64",  timelimit: "1:00:00" },
       { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
       { name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-amd64",    timelimit: "1:00:00" },
-      { name: "daily-sulong-test-ce-standalones-native-jdk-latest-darwin-amd64",  timelimit: "1:00:00", targets: [] } + sc.daily,
+      # JDK latest only works on MacOS Ventura (GR-49652)
+      # { name: "daily-sulong-test-ce-standalones-native-jdk-latest-darwin-amd64",  timelimit: "1:00:00", targets: [] } + sc.daily,
       { name: "gate-sulong-test-ce-standalones-native-jdk-latest-windows-amd64",  timelimit: "1:00:00" },
       { name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-aarch64",  timelimit: "1:00:00" },
       { name: "gate-sulong-test-ce-standalones-native-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
@@ -89,14 +93,16 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     sc.mapPrototypePlatformName([sc.weekly + $.sulong + sc.coverage($.regular_builds)],
     [
       [sc.linux_amd64,    [sc.labsjdkLatest]],
-      [sc.darwin_amd64,   [sc.labsjdkLatest]],
+      # JDK latest only works on MacOS Ventura (GR-49652)
+      # [sc.darwin_amd64,   [sc.labsjdkLatest]],
       [sc.windows_amd64,  [sc.labsjdkLatest]],
       [sc.linux_aarch64,  [sc.labsjdkLatest]],
       [sc.darwin_aarch64, [sc.labsjdkLatest]],
     ],
     [
       { name: "weekly-sulong-coverage-jdk-latest-linux-amd64",    timelimit: "1:00:00" },
-      { name: "weekly-sulong-coverage-jdk-latest-darwin-amd64",   timelimit: "1:00:00" },
+      # JDK latest only works on MacOS Ventura (GR-49652)
+      # { name: "weekly-sulong-coverage-jdk-latest-darwin-amd64",   timelimit: "1:00:00" },
       { name: "weekly-sulong-coverage-jdk-latest-windows-amd64",  timelimit: "1:00:00" },
       { name: "weekly-sulong-coverage-jdk-latest-linux-aarch64",  timelimit: "1:00:00" },
       { name: "weekly-sulong-coverage-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet
@@ -109,10 +109,13 @@
       [
         linux_amd64  + jdk + sigtest + guard,
         linux_amd64  + jdk + simple_tool_maven_project_gate + common.mach5_target,
-        darwin_amd64 + jdk + truffle_weekly + gate_lite + guard,
+        # JDK latest only works on MacOS Ventura (GR-49652)
+        # darwin_amd64 + jdk + truffle_weekly + gate_lite + guard,
       ] for jdk in [common.oraclejdk21, common.oraclejdkLatest]
     ]) +
   [
+    # JDK latest only works on MacOS Ventura (GR-49652)
+    darwin_amd64 + common.oraclejdk21 + truffle_weekly + gate_lite + guard,
     # The simple_language_maven_project_gate uses native-image, so we must run on labsjdk rather than oraclejdk
     linux_amd64  + common.labsjdk21 + simple_language_maven_project_gate,
     linux_amd64  + common.labsjdkLatest + simple_language_maven_project_gate,
diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.panama/src/com/oracle/truffle/nfi/backend/panama/ArgumentNode.java b/truffle/src/com.oracle.truffle.nfi.backend.panama/src/com/oracle/truffle/nfi/backend/panama/ArgumentNode.java
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.panama/src/com/oracle/truffle/nfi/backend/panama/ClosureArgumentNode.java b/truffle/src/com.oracle.truffle.nfi.backend.panama/src/com/oracle/truffle/nfi/backend/panama/ClosureArgumentNode.java
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.panama/src/com/oracle/truffle/nfi/backend/panama/NativeString.java b/truffle/src/com.oracle.truffle.nfi.backend.panama/src/com/oracle/truffle/nfi/backend/panama/NativeString.java
diff --git a/vm/ci/ci_common/common-bench.jsonnet b/vm/ci/ci_common/common-bench.jsonnet

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@`
`20`	`20`	`builds: [`
`21`	`21`	`common.linux_amd64 + common.oraclejdkLatest + sdk_gate + common.deps.eclipse + common.deps.jdt,`
`22`	`22`	`common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt + common.mach5_target,`
`23`		`- common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,`
	`23`	`+ # JDK latest only works on MacOS Ventura (GR-49652)`
	`24`	`+ # common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,`
	`25`	`+ common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate,`
`24`	`26`	`common.darwin_amd64 + common.oraclejdk21 + sdk_gate + common.mach5_target,`
`25`	`27`	`]`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`# SOFTWARE.`
`40`	`40`	`#`
`41`	`41`	`suite = {`
`42`		`- "mxversion": "6.52.0",`
	`42`	`+ "mxversion": "6.53.2",`
`43`	`43`	`"name" : "sdk",`
`44`	`44`	`"version" : "24.0.0",`
`45`	`45`	`"release" : False,`