Skip to content

Commit 0844fa8

Browse files
committed
Update JVMCI version.
1 parent 1fd4814 commit 0844fa8

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,7 @@ public int threadLastJavaFpOffset() {
405405
public final int frameInterpreterFrameLastSpOffset = getConstant("frame::interpreter_frame_last_sp_offset", Integer.class, 0, osArch.equals("amd64"));
406406

407407
private final Integer biasedLockMaskInPlace = getConstant(markWordField("biased_lock_mask_in_place"), Integer.class, null, JDK < 18);
408-
private final Integer lockMaskInPlace = getConstant(markWordField("lock_mask_in_place"), Integer.class, null,
409-
JVMCI ? (JDK == 20 && jvmciGE(JVMCI_23_1_b02)) || (JDK >= 21 && jvmciGE(JVMCI_23_1_b04)) : (JDK == 21 && JDK_BUILD >= 23) || JDK >= 22);
408+
private final Integer lockMaskInPlace = getConstant(markWordField("lock_mask_in_place"), Integer.class, null, JDK == 20 && jvmciGE(JVMCI_23_0_b12));
410409

411410
public int getLockMaskInPlace() {
412411
if (JDK >= 18) {

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,7 @@ protected static String getProperty(String name) {
126126
protected static final Version JVMCI_23_0_b06 = new Version(23, 0, 6);
127127
protected static final Version JVMCI_23_0_b07 = new Version(23, 0, 7);
128128
protected static final Version JVMCI_23_0_b10 = new Version(23, 0, 10);
129-
130-
protected static final Version JVMCI_23_1_b02 = new Version(23, 1, 2);
131-
protected static final Version JVMCI_23_1_b04 = new Version(23, 1, 4);
129+
protected static final Version JVMCI_23_0_b12 = new Version(23, 0, 12);
132130

133131
public static boolean jvmciGE(Version v) {
134132
return JVMCI && !JVMCI_VERSION.isLessThan(v);

0 commit comments

Comments
 (0)