Skip to content

Commit 367e521

Browse files
OracleLabsAutomationzapster
OracleLabsAutomation
authored and
zapster
committed
[GR-59685] Update labsjdk to 24+23-jvmci-b01
PullRequest: graal/19265
2 parents 956ca1a + 6a13795 commit 367e521

File tree

11 files changed

+70
-40
lines changed

11 files changed

+70
-40
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": "24", "build_id": "jdk-24+22-2651", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+23-2783", "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
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

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

5757
"eclipse": {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUnsafeAccess.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,25 @@
3333
import jdk.vm.ci.meta.MetaAccessProvider;
3434
import jdk.vm.ci.meta.ResolvedJavaMethod;
3535
import jdk.vm.ci.meta.ResolvedJavaType;
36-
import sun.misc.Unsafe;
3736

3837
/**
3938
* Checks that {@code sun.misc.Unsafe} is never used.
4039
*/
4140
public class VerifyUnsafeAccess extends VerifyPhase<CoreProviders> {
41+
private static final Class<?> UNSAFE_CLASS;
42+
43+
static {
44+
try {
45+
UNSAFE_CLASS = Class.forName("sun.misc.Unsafe");
46+
} catch (ClassNotFoundException e) {
47+
throw new RuntimeException(e);
48+
}
49+
}
4250

4351
@Override
4452
protected void verify(StructuredGraph graph, CoreProviders context) {
4553
MetaAccessProvider metaAccess = context.getMetaAccess();
46-
final ResolvedJavaType unsafeType = metaAccess.lookupJavaType(Unsafe.class);
54+
final ResolvedJavaType unsafeType = metaAccess.lookupJavaType(UNSAFE_CLASS);
4755

4856
ResolvedJavaMethod caller = graph.method();
4957

@@ -64,7 +72,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
6472
@Override
6573
public void verifyClass(Class<?> c, MetaAccessProvider metaAccess) {
6674
for (Field field : c.getDeclaredFields()) {
67-
if (field.getType() == Unsafe.class) {
75+
if (field.getType() == UNSAFE_CLASS) {
6876
throw new VerificationError("Field of type sun.misc.Unsafe at callsite %s is prohibited.", field);
6977
}
7078
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public final int logMinObjAlignment() {
230230
public final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*");
231231
public final int secondarySupersOffset = getFieldOffset("Klass::_secondary_supers", Integer.class, "Array<Klass*>*");
232232
public final int klassHashSlotOffset = getFieldOffset("Klass::_hash_slot", Integer.class, "uint8_t", 0, JDK >= 23);
233-
public final int klassBitmapOffset = getFieldOffset("Klass::_bitmap", Integer.class, "uintx", 0, JDK >= 23);
233+
public final int klassBitmapOffset = getFieldOffset("Klass::_secondary_supers_bitmap", Integer.class, "uintx", 0, JDK >= 24);
234234

235235
// JDK-8186777
236236
public final int classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle");
@@ -295,7 +295,7 @@ public final int arrayOopDescLengthOffset() {
295295
public final int threadScopedValueCacheOffset = getFieldOffset("JavaThread::_scopedValueCache", Integer.class, "OopHandle");
296296

297297
public final int threadIsInVTMSTransitionOffset = getFieldOffset("JavaThread::_is_in_VTMS_transition", Integer.class, "bool");
298-
public final int threadIsInTmpVTMSTransitionOffset = getFieldOffset("JavaThread::_is_in_tmp_VTMS_transition", Integer.class, "bool");
298+
public final int threadIsInTmpVTMSTransitionOffset = getFieldOffset("JavaThread::_is_in_tmp_VTMS_transition", Integer.class, "bool", -1, JDK == 21);
299299
public final int threadIsDisableSuspendOffset = getFieldOffset("JavaThread::_is_disable_suspend", Integer.class, "bool", -1, JDK >= 22);
300300

301301
public final int javaLangThreadJFREpochOffset = getFieldValue("java_lang_Thread::_jfr_epoch_offset", Integer.class, "int");

‎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
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5656
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
5757
"24", Map.of(
58-
"Oracle Corporation", createLabsJDKVersion("24+22", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+22", 1)));
58+
"Oracle Corporation", createLabsJDKVersion("24+23", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+23", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -869,26 +869,25 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
869869
}
870870
});
871871
}
872-
Type[] notifyJvmtiHideFramesArgTypes = JavaVersionUtil.JAVA_SPEC >= 23 ? new Type[]{boolean.class} : new Type[]{Receiver.class, boolean.class};
873-
r.register(new InvocationPlugin("notifyJvmtiHideFrames", notifyJvmtiHideFramesArgTypes) {
874-
@Override
875-
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode hide) {
876-
if (config.doJVMTIVirtualThreadTransitions) {
877-
try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
878-
if (JavaVersionUtil.JAVA_SPEC < 23) {
872+
if (JavaVersionUtil.JAVA_SPEC == 21) {
873+
r.register(new InvocationPlugin("notifyJvmtiHideFrames", Receiver.class, boolean.class) {
874+
@Override
875+
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode hide) {
876+
if (config.doJVMTIVirtualThreadTransitions) {
877+
try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
879878
receiver.get(true);
879+
// unconditionally update the temporary VTMS transition bit in current
880+
// JavaThread
881+
GraalError.guarantee(config.threadIsInTmpVTMSTransitionOffset != -1, "JavaThread::_is_in_tmp_VTMS_transition is not exported");
882+
CurrentJavaThreadNode javaThread = b.add(new CurrentJavaThreadNode(helper.getWordKind()));
883+
OffsetAddressNode address = b.add(new OffsetAddressNode(javaThread, helper.asWord(config.threadIsInTmpVTMSTransitionOffset)));
884+
b.add(new JavaWriteNode(JavaKind.Boolean, address, HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_IS_IN_TMP_VTMS_TRANSITION, hide, BarrierType.NONE, false));
880885
}
881-
// unconditionally update the temporary VTMS transition bit in current
882-
// JavaThread
883-
GraalError.guarantee(config.threadIsInTmpVTMSTransitionOffset != -1, "JavaThread::_is_in_tmp_VTMS_transition is not exported");
884-
CurrentJavaThreadNode javaThread = b.add(new CurrentJavaThreadNode(helper.getWordKind()));
885-
OffsetAddressNode address = b.add(new OffsetAddressNode(javaThread, helper.asWord(config.threadIsInTmpVTMSTransitionOffset)));
886-
b.add(new JavaWriteNode(JavaKind.Boolean, address, HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_IS_IN_TMP_VTMS_TRANSITION, hide, BarrierType.NONE, false));
887886
}
887+
return true;
888888
}
889-
return true;
890-
}
891-
});
889+
});
890+
}
892891

893892
if (JavaVersionUtil.JAVA_SPEC >= 22) {
894893
Type[] notifyJvmtiDisableSuspendArgTypes = JavaVersionUtil.JAVA_SPEC >= 23 ? new Type[]{boolean.class} : new Type[]{Receiver.class, boolean.class};

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import com.oracle.svm.core.annotate.TargetClass;
5151
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
5252
import com.oracle.svm.core.feature.InternalFeature;
53+
import com.oracle.svm.core.util.BasedOnJDKFile;
5354

5455
import jdk.internal.misc.Unsafe;
5556

@@ -59,6 +60,7 @@
5960
*/
6061

6162
@TargetClass(java.nio.charset.CharsetEncoder.class)
63+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+23/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template")
6264
final class Target_java_nio_charset_CharsetEncoder {
6365
@Alias @RecomputeFieldValue(kind = Reset) //
6466
private WeakReference<CharsetDecoder> cachedDecoder;

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_nio_DirectByteBuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.oracle.svm.core.util.VMError;
3535

3636
@TargetClass(className = "java.nio.DirectByteBuffer")
37-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+8/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template")
37+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+23/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template")
3838
public final class Target_java_nio_DirectByteBuffer {
3939

4040
/**

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,6 @@ private void notifyJvmtiUnmount(boolean hide) {
244244
// unimplemented (GR-45392)
245245
}
246246

247-
@Substitute
248-
@TargetElement(onlyWith = JDKLatest.class)
249-
@SuppressWarnings("unused")
250-
private static void notifyJvmtiHideFrames(boolean hide) {
251-
// unimplemented (GR-45392)
252-
}
253-
254247
@Substitute
255248
@TargetElement(name = "notifyJvmtiHideFrames", onlyWith = JDK21OrEarlier.class)
256249
@SuppressWarnings({"static-method", "unused"})

‎sulong/mx.sulong/suite.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@
258258
"license" : "BSD-new",
259259
"testProject" : True,
260260
"jacoco" : "exclude",
261+
# "JDK-8332744: [REDO] 'internal proprietary API' diagnostics if --system is configured to an earlier JDK version"
262+
# is a fatal error with -Werror, can only be suppressed with `-Xlint:none`.
263+
"javac.lint.overrides" : "none",
261264
},
262265
"com.oracle.truffle.llvm.tests.harness" : {
263266
"subDir" : "tests",
@@ -447,6 +450,9 @@
447450
"workingSets" : "Truffle, LLVM",
448451
"license" : "BSD-new",
449452
"jacoco" : "include",
453+
# "JDK-8332744: [REDO] 'internal proprietary API' diagnostics if --system is configured to an earlier JDK version"
454+
# is a fatal error with -Werror, can only be suppressed with `-Xlint:none`.
455+
"javac.lint.overrides" : "none",
450456
},
451457

452458
"com.oracle.truffle.llvm.nativemode.resources" : {
@@ -488,7 +494,10 @@
488494
"license" : "BSD-new",
489495
"jacoco" : "include",
490496
# Using finalizer in signals implementation. GR-7018
491-
"javac.lint.overrides" : "-deprecation",
497+
# "javac.lint.overrides" : "-deprecation",
498+
# "JDK-8332744: [REDO] 'internal proprietary API' diagnostics if --system is configured to an earlier JDK version"
499+
# is a fatal error with -Werror, can only be suppressed with `-Xlint:none`.
500+
"javac.lint.overrides" : "none",
492501
},
493502

494503
"com.oracle.truffle.llvm.parser" : {

‎truffle/mx.truffle/suite.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@
235235
"javaCompliance" : "17+",
236236
"checkstyleVersion" : "10.7.0",
237237
"workingSets" : "API,Truffle",
238+
"javac.lint.overrides" : "none",
238239
"graalCompilerSourceEdition": "ignore",
239240
},
240241

@@ -288,6 +289,7 @@
288289
"checkstyle" : "com.oracle.truffle.api",
289290
"javaCompliance" : "17+",
290291
"workingSets" : "API,Truffle",
292+
"javac.lint.overrides" : "none",
291293
"graalCompilerSourceEdition": "ignore",
292294
},
293295

@@ -322,6 +324,7 @@
322324
"checkstyle" : "com.oracle.truffle.api",
323325
"javaCompliance" : "17+",
324326
"workingSets" : "API,Truffle",
327+
"javac.lint.overrides" : "none",
325328
"graalCompilerSourceEdition": "ignore",
326329
},
327330

@@ -361,6 +364,7 @@
361364
"checkstyle" : "com.oracle.truffle.api",
362365
"javaCompliance" : "17+",
363366
"workingSets" : "API,Truffle",
367+
"javac.lint.overrides" : "none",
364368
"graalCompilerSourceEdition": "ignore",
365369
},
366370

@@ -421,6 +425,7 @@
421425
"annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
422426
"workingSets" : "API,Truffle,Test",
423427
"jacoco" : "exclude",
428+
"javac.lint.overrides" : "none",
424429
"graalCompilerSourceEdition": "ignore",
425430
},
426431

@@ -445,6 +450,7 @@
445450
"annotationProcessors" : ["mx:JMH_1_21", "TRUFFLE_DSL_PROCESSOR"],
446451
"workingSets" : "API,Truffle,Test",
447452
"jacoco" : "exclude",
453+
"javac.lint.overrides" : "none",
448454
"graalCompilerSourceEdition": "ignore",
449455
},
450456

@@ -473,6 +479,7 @@
473479
"checkstyle" : "com.oracle.truffle.api",
474480
"javaCompliance" : "17+",
475481
"workingSets" : "API,Truffle,Codegen",
482+
"javac.lint.overrides" : "none",
476483
"graalCompilerSourceEdition": "ignore",
477484
},
478485

@@ -649,6 +656,7 @@
649656
"checkstyle" : "com.oracle.truffle.api",
650657
"javaCompliance" : "17+",
651658
"workingSets" : "API,Truffle",
659+
"javac.lint.overrides" : "none",
652660
"graalCompilerSourceEdition": "ignore",
653661
},
654662

@@ -671,6 +679,7 @@
671679
"checkstyle" : "com.oracle.truffle.api",
672680
"javaCompliance" : "17+",
673681
"workingSets" : "API,Truffle",
682+
"javac.lint.overrides" : "none",
674683
"graalCompilerSourceEdition": "ignore",
675684
},
676685

@@ -698,6 +707,7 @@
698707
"workingSets" : "API,Truffle,Codegen,Test",
699708
"jacoco" : "exclude",
700709
"testProject" : True,
710+
"javac.lint.overrides" : "none",
701711
"graalCompilerSourceEdition": "ignore",
702712
},
703713

@@ -716,6 +726,7 @@
716726
"javaCompliance" : "17+",
717727
"javadocType" : "api",
718728
"workingSets" : "API,Truffle",
729+
"javac.lint.overrides" : "none",
719730
"graalCompilerSourceEdition": "ignore",
720731
},
721732

@@ -756,6 +767,7 @@
756767
"javaCompliance" : "17+",
757768
"annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
758769
"workingSets" : "Truffle",
770+
"javac.lint.overrides" : "none",
759771
"graalCompilerSourceEdition": "ignore",
760772
},
761773

@@ -834,6 +846,7 @@
834846
"workingSets" : "Truffle,Test",
835847
"jacoco" : "exclude",
836848
"testProject" : True,
849+
"javac.lint.overrides" : "none",
837850
"graalCompilerSourceEdition": "ignore",
838851
},
839852
"com.oracle.truffle.tck.instrumentation" : {
@@ -906,6 +919,7 @@
906919
},
907920
},
908921
},
922+
"javac.lint.overrides" : "none",
909923
"graalCompilerSourceEdition": "ignore",
910924
},
911925

@@ -940,6 +954,7 @@
940954
"javaCompliance" : "17+",
941955
"annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
942956
"workingSets" : "Truffle",
957+
"javac.lint.overrides" : "none",
943958
"graalCompilerSourceEdition": "ignore",
944959
},
945960

@@ -1019,6 +1034,7 @@
10191034
},
10201035
"testProject" : True,
10211036
"jacoco" : "exclude",
1037+
"javac.lint.overrides" : "none",
10221038
"graalCompilerSourceEdition": "ignore",
10231039
},
10241040

‎wasm/mx.wasm/suite.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@
9393
"annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
9494
"workingSets" : "WebAssembly",
9595
"license" : "UPL",
96+
# "JDK-8332744: [REDO] 'internal proprietary API' diagnostics if --system is configured to an earlier JDK version"
97+
# is a fatal error with -Werror, can only be suppressed with `-Xlint:none`.
98+
"javac.lint.overrides" : "none",
9699
},
97100

98101
"org.graalvm.wasm.launcher" : {

0 commit comments

Comments
 (0)