From 95cd186878b718113f2254bdbacd917b1fc5e75a Mon Sep 17 00:00:00 2001 From: ol-automation_ww Date: Thu, 26 Sep 2024 19:54:36 +0000 Subject: [PATCH 1/7] update JVMCI to 24+17-jvmci-b01 --- common.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common.json b/common.json index be2d46c0a159..49527d578de6 100644 --- a/common.json +++ b/common.json @@ -47,13 +47,13 @@ "oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]}, - "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+16", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+16-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+16-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+16-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+16-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+16-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+16-jvmci-b01-sulong", "platformspecific": true } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+17", "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-20240926165016-22b5015780", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-20240926165016-22b5015780-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-20240926165016-22b5015780-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-20240926165016-22b5015780+575ee8cadf", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-20240926165016-22b5015780+575ee8cadf-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-20240926165016-22b5015780+575ee8cadf-sulong", "platformspecific": true } }, "eclipse": { From cd94784b09fbc5096711841b92122b18ea0a9b04 Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Fri, 27 Sep 2024 09:31:07 +0200 Subject: [PATCH 2/7] svm: update @BasedOnJDKFile annotations for LibCHelper --- .../src/com/oracle/svm/core/LibCHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LibCHelper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LibCHelper.java index aa65cd6985a1..7b26c78e55b8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LibCHelper.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LibCHelper.java @@ -46,13 +46,13 @@ public class LibCHelper { @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+13/src/java.base/windows/native/libjava/locale_str.h") public static class Locale { @CFunction(transition = Transition.TO_NATIVE) - @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/java.base/unix/native/libjava/java_props_md.c#L93-L540") - @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+13/src/java.base/windows/native/libjava/java_props_md.c#L257-L713") + @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L93-L357") + @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/windows/native/libjava/java_props_md.c#L321-L715") public static native CCharPointerPointer parseDisplayLocale(); @CFunction(transition = Transition.TO_NATIVE) - @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/java.base/unix/native/libjava/java_props_md.c#L93-L540") - @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+13/src/java.base/windows/native/libjava/java_props_md.c#L257-L713") + @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L93-L357") + @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/windows/native/libjava/java_props_md.c#L321-L715") public static native CCharPointerPointer parseFormatLocale(); } } From 964658bab6eaa6dad061bad133520037381a999c Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Fri, 27 Sep 2024 09:31:19 +0200 Subject: [PATCH 3/7] svm: review libcontainer changes in JDK 24+17 --- .../src/com/oracle/svm/core/container/ContainerLibrary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java index 4ae01100898a..e3ac87060bd2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java @@ -71,7 +71,7 @@ @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allocation.inline.hpp") @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allStatic.hpp") @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/nmt/memTag.hpp") -@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.cpp") +@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/hotspot/share/runtime/os.cpp") @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.hpp") @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.inline.hpp") @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/utilities/checkedCast.hpp") From 28e5d0014495780431843dcbe17d2bada5a9ad8d Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Fri, 27 Sep 2024 09:32:16 +0200 Subject: [PATCH 4/7] compiler: update JVMCIVersionCheck --- .../src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 8939e7ad666d..034b285fa0fd 100644 --- 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 @@ -55,8 +55,8 @@ public final class JVMCIVersionCheck { private static final Map> JVMCI_MIN_VERSIONS = Map.of( "21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)), "24", Map.of( - "Oracle Corporation", createLabsJDKVersion("24+16", 1), - DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+16", 1))); + "Oracle Corporation", createLabsJDKVersion("24+17", 1), + DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+17", 1))); private static final int NA = 0; /** * Minimum Java release supported by Graal. From 44209be968ed869d3d5190db66cc3595a6132c25 Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Fri, 27 Sep 2024 10:52:26 +0200 Subject: [PATCH 5/7] compiler: add Math.tanh to UnimplementedGraalIntrinsics (JDK-8338694) --- .../compiler/hotspot/meta/UnimplementedGraalIntrinsics.java | 3 +++ 1 file changed, 3 insertions(+) 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 index 1e11806ba69a..ba3499659787 100644 --- 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 @@ -93,6 +93,9 @@ public UnimplementedGraalIntrinsics(Architecture arch) { // beneficial. "java/lang/Math.max(II)I", "java/lang/Math.min(II)I", + // Newly added by JDK-8338694 + "java/lang/Math.tanh(D)D", + // see Math.min/max "java/lang/StrictMath.max(II)I", "java/lang/StrictMath.min(II)I", // handled through an intrinsic for String.equals itself From 903330b5cb501ef5526f5cda03d3692c682b2653 Mon Sep 17 00:00:00 2001 From: Marouane El Hallaoui Date: Fri, 27 Sep 2024 11:49:38 +0100 Subject: [PATCH 6/7] deploy snapshots --- common.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common.json b/common.json index 49527d578de6..cf2c0760ad01 100644 --- a/common.json +++ b/common.json @@ -48,12 +48,12 @@ "oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]}, "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+17", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-20240926165016-22b5015780", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-20240926165016-22b5015780-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-20240926165016-22b5015780-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-20240926165016-22b5015780+575ee8cadf", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-20240926165016-22b5015780+575ee8cadf-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-20240926165016-22b5015780+575ee8cadf-sulong", "platformspecific": true } + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": { From fc5b9746a8ebcf8e0e942cd688344b580e5ceccd Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Fri, 27 Sep 2024 16:29:33 +0200 Subject: [PATCH 7/7] svm: work around "JDK-8340831: Simplify simple validation for class definition in MethodHandles.Lookup" [GR-58553] --- .../src/com/oracle/svm/agent/BreakpointInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java index 4e9c6cd214cf..d5f365b33912 100644 --- a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java +++ b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java @@ -1739,7 +1739,7 @@ private static boolean allocateInstance(JNIEnvironment jni, JNIObjectHandle thre }; private static final BreakpointSpecification[] CLASS_PREDEFINITION_BREAKPOINT_SPECIFICATIONS = { - brk("java/lang/invoke/MethodHandles$Lookup$ClassFile", "", "(Ljava/lang/String;I[B)V", BreakpointInterceptor::onMethodHandleClassFileInit), + optionalBrk("java/lang/invoke/MethodHandles$Lookup$ClassFile", "", "(Ljava/lang/String;I[B)V", BreakpointInterceptor::onMethodHandleClassFileInit), }; private static BreakpointSpecification brk(String className, String methodName, String signature, BreakpointHandler handler) {