[GR-64422] Update labsjdk to 25+19-jvmci-b01

common.json

@@ -45,13 +45,13 @@
 
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+18", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+18-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+18-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+18-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+18-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+18-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+18-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+19", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+19-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+19-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+19-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+19-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+19-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+19-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -129,7 +129,7 @@
 
   barista_template(suite_version=null, suite_name="barista", max_jdk_version=null, cmd_app_prefix=["hwloc-bind --cpubind node:0.core:0-3.pu:0 --membind node:0"], non_prefix_barista_args=[]):: cc.compiler_benchmark + {
     suite:: suite_name,
-    local barista_version = "v0.3.3",
+    local barista_version = "v0.3.4",
     local suite_version_args = if suite_version != null then ["--bench-suite-version=" + suite_version] else [],
     local prefix_barista_arg = if std.length(cmd_app_prefix) > 0 then [std.format("--cmd-app-prefix=%s", std.join(" ", cmd_app_prefix))] else [],
     local all_barista_args = prefix_barista_arg + non_prefix_barista_args,

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java

@@ -56,8 +56,8 @@ public final class JVMCIVersionCheck {
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
                     "21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
                     "25", Map.of(
-                                    "Oracle Corporation", createLabsJDKVersion("25+18", 1),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+18", 1)));
+                                    "Oracle Corporation", createLabsJDKVersion("25+19", 1),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+19", 1)));
     private static final int NA = 0;
     /**
      * Minimum Java release supported by Graal.

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java

@@ -119,6 +119,17 @@ public UnimplementedGraalIntrinsics(Architecture arch) {
                             // scalar operations
                             "jdk/internal/vm/vector/Float16Math.fma(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljdk/internal/vm/vector/Float16Math$TernaryOperator;)Ljava/lang/Object;",
                             "jdk/internal/vm/vector/Float16Math.sqrt(Ljava/lang/Class;Ljava/lang/Object;Ljava/util/function/UnaryOperator;)Ljava/lang/Object;");
+
+            add(toBeInvestigated,
+                            // JDK-8349721: Add aarch64 intrinsics for ML-KEM
+                            // JDK-8351412: Add AVX-512 intrinsics for ML-KEM
+                            "com/sun/crypto/provider/ML_KEM.implKyber12To16([BI[SI)I",
+                            "com/sun/crypto/provider/ML_KEM.implKyberAddPoly([S[S[S)I",
+                            "com/sun/crypto/provider/ML_KEM.implKyberAddPoly([S[S[S[S)I",
+                            "com/sun/crypto/provider/ML_KEM.implKyberBarrettReduce([S)I",
+                            "com/sun/crypto/provider/ML_KEM.implKyberInverseNtt([S[S)I",
+                            "com/sun/crypto/provider/ML_KEM.implKyberNtt([S[S)I",
+                            "com/sun/crypto/provider/ML_KEM.implKyberNttMult([S[S[S[S)I");
         }
 
         add(ignore,

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/locale/LocaleCHelper.java

@@ -61,7 +61,7 @@ class LocaleCHelper {
     @CFunction(value = "svm_initialize_locale", transition = NO_TRANSITION)
     @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L71-L357")
     @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L436-L460")
-    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+17/src/java.base/windows/native/libjava/java_props_md.c#L263-L722")
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/java.base/windows/native/libjava/java_props_md.c#L264-L731")
     static native int initializeLocale();
 
     @CFunction(value = "svm_get_locale", transition = NO_TRANSITION)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java

@@ -50,7 +50,7 @@
 // The following annotations are for files in `src/hotspot`, which are copied from the JDK
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/java.base/share/native/include/jni.h")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/java.base/unix/native/include/jni_md.h")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupSubsystem_linux.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/os/linux/cgroupSubsystem_linux.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupSubsystem_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupUtil_linux.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupUtil_linux.hpp")
@@ -60,7 +60,7 @@
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.hpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/os/linux/os_linux.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/include/jvm_md.h")
@@ -71,8 +71,8 @@
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allStatic.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/nmt/memTag.hpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.cpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/share/runtime/os.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/share/runtime/os.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/checkedCast.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
@@ -85,7 +85,7 @@
 // The following annotations are for files in `src/svm`, which are completely customized for SVM
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/logging/log.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.cpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/globals.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/share/runtime/globals.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.hpp")
 public class ContainerLibrary {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodTypeForm.java

@@ -32,6 +32,7 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.fieldvaluetransformer.NewEmptyArrayFieldValueTransformer;
+import com.oracle.svm.core.invoke.Target_java_lang_invoke_MemberName;
 import com.oracle.svm.core.jdk.JDK21OrEarlier;
 import com.oracle.svm.core.jdk.JDKLatest;
 
@@ -50,6 +51,10 @@ final class Target_java_lang_invoke_MethodTypeForm {
     @TargetElement(onlyWith = JDKLatest.class) //
     private Object[] lambdaForms;
 
+    @Alias @RecomputeFieldValue(kind = Kind.Reset) //
+    @TargetElement(onlyWith = JDKLatest.class) //
+    private SoftReference<Target_java_lang_invoke_MemberName> interpretEntry;
+
     @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NewEmptyArrayFieldValueTransformer.class, isFinal = true) //
     @TargetElement(name = "methodHandles", onlyWith = JDK21OrEarlier.class) //
     private SoftReference<?>[] methodHandlesJDK21;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoader.java

@@ -729,10 +729,16 @@ private Class<?> defineClass(String cn, LoadedModule loadedModule) {
 
     /**
      * See {@code jdk.internal.loader.Loader#getPermissions}.
+     *
+     * The override was removed in JDK 24 by JDK-8343982.
      */
+    @SuppressWarnings("deprecation")
     @Override
     protected PermissionCollection getPermissions(CodeSource cs) {
         PermissionCollection perms = super.getPermissions(cs);
+        if (JavaVersionUtil.JAVA_SPEC > 21) {
+            return perms;
+        }
 
         URL url = cs.getLocation();
         if (url == null) {

substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c

@@ -494,6 +494,10 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
     features->fTSCINV_BIT = 1;
   if (_cpuid_info->std_cpuid1_ecx.bits.aes != 0)
     features->fAES = 1;
+  if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0)
+    features->fLZCNT = 1;
+  if (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0)
+    features->fAMD_3DNOW_PREFETCH = 1;
   if (_cpuid_info->sef_cpuid7_ebx.bits.erms != 0)
     features->fERMS = 1;
   if (_cpuid_info->sef_cpuid7_edx.bits.fast_short_rep_mov != 0)
@@ -512,6 +516,8 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
     features->fFMA = 1;
   if (_cpuid_info->sef_cpuid7_ebx.bits.clflushopt != 0)
     features->fFLUSHOPT = 1;
+  if (_cpuid_info->sef_cpuid7_ebx.bits.clwb != 0)
+    features->fCLWB = 1;
   if (_cpuid_info->ext_cpuid1_edx.bits.rdtscp != 0)
     features->fRDTSCP = 1;
   if (_cpuid_info->sef_cpuid7_ecx.bits.rdpid != 0)
@@ -520,47 +526,31 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
       _cpuid_info->xem_xcr0_eax.bits.apx_f != 0)
     features->fAPX_F = 1;
 
-  // AMD|Hygon features.
+  // AMD|Hygon additional features.
   if (is_amd_family(_cpuid_info))
   {
-    if ((_cpuid_info->ext_cpuid1_edx.bits.tdnow != 0) ||
-        (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0))
+    // PREFETCHW was checked above, check TDNOW here.
+    if (_cpuid_info->ext_cpuid1_edx.bits.tdnow != 0)
       features->fAMD_3DNOW_PREFETCH = 1;
-    if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0)
-      features->fLZCNT = 1;
     if (_cpuid_info->ext_cpuid1_ecx.bits.sse4a != 0)
       features->fSSE4A = 1;
   }
 
-  // Intel features.
+  // Intel additional features.
   if (is_intel(_cpuid_info))
   {
-    if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0) {
-      features->fLZCNT = 1;
-    }
-    if (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0) {
-      features->fAMD_3DNOW_PREFETCH = 1;
-    }
-    if (_cpuid_info->sef_cpuid7_ebx.bits.clwb != 0) {
-      features->fCLWB = 1;
-    }
-    if (_cpuid_info->sef_cpuid7_edx.bits.serialize != 0) {
+    if (_cpuid_info->sef_cpuid7_edx.bits.serialize != 0)
       features->fSERIALIZE = 1;
-    }
-    if (_cpuid_info->sef_cpuid7_edx.bits.avx512_fp16 != 0) {
+    if (_cpuid_info->sef_cpuid7_edx.bits.avx512_fp16 != 0)
       features->fAVX512_FP16 = 1;
-    }
   }
 
-  // ZX features.
+  // ZX additional features.
   if (is_zx(_cpuid_info))
   {
-    if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0) {
-      features->fLZCNT = 1;
-    }
-    if (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0) {
-      features->fAMD_3DNOW_PREFETCH = 1;
-    }
+    // We do not know if these are supported by ZX, so we cannot trust
+    // common CPUID bit for them.
+    features->fCLWB = 0;
   }
 
   // Protection key features.