From 409cfb7978c09ae6b096a396dab3aa43707ccdbc Mon Sep 17 00:00:00 2001 From: ol-automation_ww Date: Sun, 11 Aug 2024 22:41:05 +0000 Subject: [PATCH 1/2] update composed labsjdk to 24+10-jvmci-b02 --- common.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common.json b/common.json index 7aa08491fe37..1a5f081a6284 100644 --- a/common.json +++ b/common.json @@ -46,12 +46,12 @@ "graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true }, "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+10", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+10-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+10-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+10-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+10-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+10-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+10-jvmci-b01-sulong", "platformspecific": true } + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+10-jvmci-b02", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+10-jvmci-b02-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+10-jvmci-b02-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+10-jvmci-b02", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+10-jvmci-b02-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+10-jvmci-b02-sulong", "platformspecific": true } }, "eclipse": { From 770444bff2da4ec0007982ad3e9e3492651f08f7 Mon Sep 17 00:00:00 2001 From: Marouane El Hallaoui Date: Mon, 12 Aug 2024 00:41:15 +0100 Subject: [PATCH 2/2] update check --- .../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 27e98b2985d6..b3df09de35dc 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+10", 1), - DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+10", 1))); + "Oracle Corporation", createOpenJDKVersion("24+10"), + DEFAULT_VENDOR_ENTRY, createOpenJDKVersion("24+10"))); private static final int NA = 0; /** * Minimum Java release supported by Graal.