Skip to content

Commit b6bc12b

Browse files
[GR-67719] Update labsjdk to 26+7-jvmci-b01.
PullRequest: graal/21513
2 parents 06223af + 622e487 commit b6bc12b

File tree

10 files changed

+26
-32
lines changed

10 files changed

+26
-32
lines changed

ci/ci_common/galahad-common.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ local utils = import "common-utils.libsonnet";
1111
,
1212
# Return true if this is a gate job.
1313
local is_gate(b) =
14-
std.find("gate", b.targets) != []
14+
std.setInter(["gate", "tier1", "tier2", "tier3"], b.targets) != []
1515
,
16-
local gate_or_postmerge_targets = ["gate", "post-merge", "deploy"],
16+
local gate_or_postmerge_targets = ["gate", "tier1", "tier2", "tier3", "post-merge", "deploy"],
1717
# Return true if this is a gate or post-merge/deployment job.
1818
local is_gate_or_postmerge(b) =
1919
std.setInter(gate_or_postmerge_targets, b.targets) != []

common.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+6-570", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7-655", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -53,13 +53,13 @@
5353
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
5555

56-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+6", "platformspecific": true, "extrabundles": ["static-libs"]},
57-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01", "platformspecific": true },
58-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01-debug", "platformspecific": true },
59-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-sulong", "platformspecific": true },
60-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01", "platformspecific": true },
61-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01-debug", "platformspecific": true },
62-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
56+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7", "platformspecific": true, "extrabundles": ["static-libs"]},
57+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+7-jvmci-b01", "platformspecific": true },
58+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+7-jvmci-b01-debug", "platformspecific": true },
59+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+7-jvmci-b01-sulong", "platformspecific": true },
60+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+7-jvmci-b01", "platformspecific": true },
61+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+7-jvmci-b01-debug", "platformspecific": true },
62+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+7-jvmci-b01-sulong", "platformspecific": true }
6363
},
6464

6565
"eclipse": {

compiler/mx.compiler/mx_compiler.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,9 +1264,6 @@ def get_latest_jvmci_version():
12641264
mx.abort(msg)
12651265

12661266
if version_check_setting == 'strict' and not success:
1267-
# [GR-67676] The `-llvm` artifacts are currently not up to date due to a JDK build system problem JDK-8361844.
1268-
if latest.endswith('-llvm'):
1269-
return
12701267
if latest == 'not found':
12711268
msg = f'No JVMCI JDK found in {common_path} that matches {_jdk_jvmci_version}.'
12721269
msg += os.linesep + f'Check that {latest} matches the versions of the other JVMCI JDKs.'

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
@@ -57,8 +57,8 @@ public final class JVMCIVersionCheck {
5757
// Checkstyle: stop stable iteration order check
5858
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5959
"26", Map.of(
60-
"Oracle Corporation", createLabsJDKVersion("26+6", 1),
61-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+6", 1)));
60+
"Oracle Corporation", createLabsJDKVersion("26+7", 1),
61+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+7", 1)));
6262
// Checkstyle: resume stable iteration order check
6363

6464
private static final int NA = 0;

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
@@ -1961,10 +1961,10 @@ private EspressoException unsatisfiedLinkError() {
19611961
private void checkPoisonPill(Meta meta) {
19621962
if (poisonPill) {
19631963
// Conflicting Maximally-specific non-abstract interface methods.
1964-
if (getJavaVersion().java9OrLater() && getSpecComplianceMode() == EspressoOptions.SpecComplianceMode.HOTSPOT) {
1964+
if (getJavaVersion().inRange(9, 25) && getSpecComplianceMode() == EspressoOptions.SpecComplianceMode.HOTSPOT) {
19651965
/*
19661966
* Supposed to be IncompatibleClassChangeError (see jvms-6.5.invokeinterface),
1967-
* but HotSpot throws AbstractMethodError.
1967+
* but HotSpot throws AbstractMethodError. See JDK-8356942.
19681968
*/
19691969
throw meta.throwExceptionWithMessage(meta.java_lang_AbstractMethodError, "Conflicting default methods: " + getName());
19701970
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class LocaleCHelper {
5959
* {@link #SVM_LOCALE_INITIALIZATION_OUT_OF_MEMORY}.
6060
*/
6161
@CFunction(value = "svm_initialize_locale", transition = NO_TRANSITION)
62-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L71-L357")
62+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+7/src/java.base/unix/native/libjava/java_props_md.c#L71-L359")
6363
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L436-L460")
6464
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/java.base/windows/native/libjava/java_props_md.c#L263-L721")
6565
static native int initializeLocale();

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

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmti/headers/JvmtiDirectives.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.oracle.svm.core.SubstrateOptions;
3636
import com.oracle.svm.core.util.BasedOnJDKFile;
3737

38-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/share/prims/jvmti.xml")
38+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+7/src/hotspot/share/prims/jvmti.xml")
3939
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+11/src/hotspot/share/prims/jvmtiH.xsl")
4040
class JvmtiDirectives implements CContext.Directives {
4141
private final Path jdkIncludeDir = Paths.get(System.getProperty("java.home")).resolve("include");

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ static int ParseLocale(int cat, char ** std_language, char ** std_script,
206206
if (language != NULL && mapLookup(language_names, language, std_language) == 0) {
207207
*std_language = malloc(strlen(language)+1);
208208
if (*std_language == NULL) {
209+
free(temp);
209210
free(encoding_variant);
210211
return SVM_LOCALE_INITIALIZATION_OUT_OF_MEMORY;
211212
}
@@ -218,6 +219,7 @@ static int ParseLocale(int cat, char ** std_language, char ** std_script,
218219
if (mapLookup(country_names, country, std_country) == 0) {
219220
*std_country = malloc(strlen(country)+1);
220221
if (*std_country == NULL) {
222+
free(temp);
221223
free(encoding_variant);
222224
return SVM_LOCALE_INITIALIZATION_OUT_OF_MEMORY;
223225
}

substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/resources/jdk_privileged_methods.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,17 +2839,6 @@
28392839
}
28402840
]
28412841
},
2842-
{
2843-
"name": "java.applet.Applet",
2844-
"methods": [
2845-
{
2846-
"name": "setStub",
2847-
"parameterTypes": [
2848-
"java.applet.AppletStub"
2849-
]
2850-
}
2851-
]
2852-
},
28532842
{
28542843
"name": "java.awt.Button",
28552844
"methods": [

0 commit comments

Comments
 (0)