Skip to content

Commit 4088940

Browse files
OracleLabsAutomationansalond
authored andcommitted
[GR-67650] [GR-67735] [GR-67811] Update labsjdk to 25+32-jvmci-b01
PullRequest: graal/21514
2 parents 8f33e0c + 2b15d3d commit 4088940

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

common.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+30", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+32", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+32-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+32-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+32-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+32-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+32-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+32-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
5555
*/
5656
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5757
"25", Map.of(
58-
"Oracle Corporation", createLabsJDKVersion("25+30", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+30", 1)));
58+
"Oracle Corporation", createLabsJDKVersion("25+32", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+32", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,10 +1966,10 @@ private EspressoException unsatisfiedLinkError() {
19661966
private void checkPoisonPill(Meta meta) {
19671967
if (poisonPill) {
19681968
// Conflicting Maximally-specific non-abstract interface methods.
1969-
if (getJavaVersion().java9OrLater() && getSpecComplianceMode() == EspressoOptions.SpecComplianceMode.HOTSPOT) {
1969+
if (getJavaVersion().inRange(9, 24) && getSpecComplianceMode() == EspressoOptions.SpecComplianceMode.HOTSPOT) {
19701970
/*
19711971
* Supposed to be IncompatibleClassChangeError (see jvms-6.5.invokeinterface),
1972-
* but HotSpot throws AbstractMethodError.
1972+
* but HotSpot throws AbstractMethodError. See JDK-8356942.
19731973
*/
19741974
throw meta.throwExceptionWithMessage(meta.java_lang_AbstractMethodError, "Conflicting default methods: " + getName());
19751975
}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,15 @@ public static void setMethodSamplingPeriod(long type, long intervalMillis) {
296296
SubstrateJVM.get().setMethodSamplingInterval(type, intervalMillis);
297297
}
298298

299-
/** See {@code JVM#setCPUThrottle}. */
299+
/** See {@code JVM#setCPURate}. */
300300
@Substitute
301-
public static void setCPUThrottle(double rate, boolean autoAdapt) {
301+
public static void setCPURate(double rate) {
302+
// JFR CPUTimeSample is not supported.
303+
}
304+
305+
/** See {@code JVM#setCPUPeriod}. */
306+
@Substitute
307+
public static void setCPUPeriod(long periodNanos) {
302308
// JFR CPUTimeSample is not supported.
303309
}
304310

0 commit comments

Comments
 (0)