Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP [GR-52689] [GR-51510] [GR-51509] [GR-51507] [Composed] Update labsjdk to 23+18-jvmci-b02 #8728

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP [GR-52689] [GR-51510] [GR-51509] [GR-51507] [Composed] Update labsjdk to 23+18-jvmci-b02 #8728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
518a3a7
test composed labsjdk based on 23+18-jvmci-b02
marwan-hallaoui Apr 16, 2024
a050286
Espresso: Use Runtime.Version to find host version
gilles-duboscq Apr 15, 2024
f6331ea
apply reviewer remark
zapster Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },

"oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+18", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+18-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+18-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+18-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+18-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+18-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+18-jvmci-b01-sulong", "platformspecific": true }
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+18-jvmci-b02", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+18-jvmci-b02-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+18-jvmci-b02-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+18-jvmci-b02", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+18-jvmci-b02-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+18-jvmci-b02-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
6 changes: 3 additions & 3 deletions compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public final class JVMCIVersionCheck {
* default/fallback entry.
*/
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
"21", Map.of(DEFAULT_VENDOR_ENTRY, new Version(23, 1, 33)),
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
"23", Map.of(
"Oracle Corporation", new Version("23+18", 1),
DEFAULT_VENDOR_ENTRY, new Version("23+18", 1)));
"Oracle Corporation", createOpenJDKVersion("23+18"),
DEFAULT_VENDOR_ENTRY, createOpenJDKVersion("23+18")));
private static final int NA = 0;
/**
* Minimum Java release supported by Graal.
Expand Down
7 changes: 6 additions & 1 deletion .../src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JavaVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public boolean contains(JavaVersion version) {
}
}

public static final JavaVersion HOST_VERSION = forVersion(System.getProperty("java.version"));
public static final JavaVersion HOST_VERSION = forVersion(Runtime.version());

public static final int LATEST_SUPPORTED = 21;

private final int version;
Expand Down Expand Up @@ -95,6 +96,10 @@ public static JavaVersion forVersion(String version) {
}
}

private static JavaVersion forVersion(Runtime.Version version) {
return forVersion(version.feature());
}

public static JavaVersion latestSupported() {
return forVersion(LATEST_SUPPORTED);
}
Expand Down