Skip to content

Commit 5875d28

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
[GR-65447] Update labsjdk to 25+25-jvmci-b01
PullRequest: graal/20961
2 parents d019d3d + 45487df commit 5875d28

File tree

9 files changed

+29
-44
lines changed

9 files changed

+29
-44
lines changed

‎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-25+24-2970", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26-3156", "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 },
@@ -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+24", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+24-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+24-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+24-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+24-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+24-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+24-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+25", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+25-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+25-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+25-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+25-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+25-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+25-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalServices.java‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
3333
import jdk.graal.compiler.core.common.LibGraalSupport;
3434
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
3535
import jdk.vm.ci.hotspot.HotSpotObjectConstantScope;
36+
import jdk.vm.ci.hotspot.HotSpotProfilingInfo;
3637
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
3738
import jdk.vm.ci.hotspot.HotSpotSpeculationLog;
3839
import jdk.vm.ci.hotspot.VMIntrinsicMethod;
@@ -48,9 +49,6 @@
4849
public class HotSpotGraalServices {
4950

5051
private static final Method methodGetOopMapAt;
51-
private static final Class<?> hotspotProfilingInfoClass;
52-
private static final Method getDecompileCountMethod;
53-
private static final Field methodDataField;
5452

5553
static {
5654
Method getOopMapAt = null;
@@ -61,18 +59,6 @@ public class HotSpotGraalServices {
6159
}
6260

6361
methodGetOopMapAt = getOopMapAt;
64-
65-
try {
66-
@SuppressWarnings("unchecked")
67-
Class<?> hotspotMethodData = Class.forName("jdk.vm.ci.hotspot.HotSpotMethodData");
68-
hotspotProfilingInfoClass = Class.forName("jdk.vm.ci.hotspot.HotSpotProfilingInfo");
69-
methodDataField = hotspotProfilingInfoClass.getDeclaredField("methodData");
70-
methodDataField.setAccessible(true);
71-
getDecompileCountMethod = hotspotMethodData.getDeclaredMethod("getDecompileCount");
72-
getDecompileCountMethod.setAccessible(true);
73-
} catch (ClassNotFoundException | NoSuchMethodException | NoSuchFieldException e) {
74-
throw new InternalError("decompile count isn't available", e);
75-
}
7662
}
7763

7864
/**
@@ -108,13 +94,8 @@ public static BitSet getOopMapAt(ResolvedJavaMethod method, int bci) {
10894
*/
10995
public static int getDecompileCount(ResolvedJavaMethod method) {
11096
ProfilingInfo info = method.getProfilingInfo();
111-
if (hotspotProfilingInfoClass.isAssignableFrom(info.getClass())) {
112-
try {
113-
Object methodData = methodDataField.get(info);
114-
return (int) getDecompileCountMethod.invoke(methodData);
115-
} catch (IllegalAccessException | InvocationTargetException e) {
116-
throw new RuntimeException(info.toString(), e);
117-
}
97+
if (info instanceof HotSpotProfilingInfo hotSpotProfilingInfo) {
98+
return hotSpotProfilingInfo.getDecompileCount();
11899
}
119100
return -1;
120101
}

‎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+24", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+24", 1)));
58+
"Oracle Corporation", createLabsJDKVersion("25+25", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+25", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

‎sdk/mx.sdk/suite.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# SOFTWARE.
4040
#
4141
suite = {
42-
"mxversion": "7.49.0",
42+
"mxversion": "7.54.3",
4343
"name" : "sdk",
4444
"version" : "25.0.0",
4545
"release" : False,

‎substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+7/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp")
5050
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+1/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp")
5151
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+20/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp")
52-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+12/src/hotspot/share/gc/parallel/psParallelCompact.cpp#L963-L1180")
53-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/gc/parallel/psScavenge.cpp#L321-L637")
52+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/gc/parallel/psParallelCompact.cpp#L964-L1181")
53+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/gc/parallel/psScavenge.cpp#L319-L635")
5454
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+20/src/hotspot/share/gc/shared/gc_globals.hpp#L303-L407")
5555
class AdaptiveCollectionPolicy extends AbstractCollectionPolicy {
5656

‎substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ private static Pointer allocateRawMemory(UnsignedWord size, BooleanPointer alloc
371371
return allocateRawMemoryOutsideTlab(size, allocatedOutsideTlab);
372372
}
373373

374-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+8/src/hotspot/share/gc/shared/memAllocator.cpp#L256-L318")
374+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/gc/shared/memAllocator.cpp#L257-L329")
375375
@Uninterruptible(reason = "Holds uninitialized memory.")
376376
private static Pointer allocateRawMemoryInTlabSlow(UnsignedWord size) {
377377
ThreadLocalAllocation.Descriptor tlab = getTlab();
@@ -416,7 +416,7 @@ private static Pointer allocateRawMemoryInTlabSlow(UnsignedWord size) {
416416
return memory;
417417
}
418418

419-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23-ga/src/hotspot/share/gc/shared/memAllocator.cpp#L240-L251")
419+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/gc/shared/memAllocator.cpp#L239-L251")
420420
@Uninterruptible(reason = "Holds uninitialized memory.")
421421
private static Pointer allocateRawMemoryOutsideTlab(UnsignedWord size, BooleanPointer allocatedOutsideTlab) {
422422
allocatedOutsideTlab.write(true);

‎substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/TlabSupport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ static void fillTlab(Pointer start, Pointer top, WordPointer newSize) {
176176
refillWasteLimit.set(initialRefillWasteLimit());
177177
}
178178

179-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23-ga/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp#L150-L153")
179+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp#L143-L145")
180180
@Uninterruptible(reason = "Accesses TLAB")
181181
static void retireTlabBeforeAllocation() {
182182
long availableTlabMemory = availableTlabMemory(getTlab()).rawValue();
183183
refillWaste.set(refillWaste.get() + UninterruptibleUtils.NumUtil.safeToInt(availableTlabMemory));
184184
retireCurrentTlab(CurrentIsolate.getCurrentThread(), false);
185185
}
186186

187-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23-ga/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp#L137-L148")
187+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp#L131-L141")
188188
@Uninterruptible(reason = "Accesses TLAB")
189189
private static void retireCurrentTlab(IsolateThread thread, boolean calculateStats) {
190190
ThreadLocalAllocation.Descriptor tlab = getTlab(thread);

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.hpp")
6565
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.inline.hpp")
6666
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/include/jvm_md.h")
67-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/os/posix/os_posix.cpp")
68-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/os/posix/os_posix.hpp")
67+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/os/posix/os_posix.cpp")
68+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/os/posix/os_posix.hpp")
6969
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/os_posix.inline.hpp")
7070
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+22/src/hotspot/share/memory/allocation.hpp")
7171
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/memory/allocation.inline.hpp")
7272
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allStatic.hpp")
7373
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/nmt/memTag.hpp")
7474
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+22/src/hotspot/share/runtime/os.cpp")
75-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/runtime/os.hpp")
75+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/runtime/os.hpp")
7676
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.inline.hpp")
7777
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/checkedCast.hpp")
7878
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+22/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
@@ -85,7 +85,7 @@
8585
// The following annotations are for files in `src/svm`, which are completely customized for SVM
8686
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/logging/log.hpp")
8787
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+23/src/hotspot/share/memory/allocation.cpp")
88-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+24/src/hotspot/share/runtime/globals.hpp")
88+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/share/runtime/globals.hpp")
8989
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/utilities/debug.cpp")
9090
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.hpp")
9191
public class ContainerLibrary {

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogTag.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@
2525
*/
2626
package com.oracle.svm.core.jfr.logging;
2727

28+
import com.oracle.svm.core.util.BasedOnJDKFile;
29+
2830
/**
2931
* This enum contains all log tags that are in at least one {@link jdk.jfr.internal.LogTag}. This
3032
* class is necessary because {@link jdk.jfr.internal.LogTag} is an enum of log tag sets, and does
3133
* not provide the individual log tags.
3234
*/
35+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java")
3336
enum JfrLogTag {
3437
JFR,
3538
SYSTEM,
@@ -41,6 +44,7 @@ enum JfrLogTag {
4144
STREAMING,
4245
THROTTLE,
4346
PERIODIC,
47+
SAMPLING,
4448
DCMD,
4549
START
4650
}

0 commit comments

Comments
 (0)