Skip to content

Commit 2a04a03

Browse files
committed
Latest JDK25 changed the name of 'ReferenceQueue.NULL'.
1 parent dde4b74 commit 2a04a03

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/EspressoSymbols.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,7 @@ public static class Names {
815815
public static final Symbol<Name> lock = SYMBOLS.putName("lock");
816816
public static final Symbol<Name> next = SYMBOLS.putName("next");
817817
public static final Symbol<Name> NULL = SYMBOLS.putName("NULL");
818+
public static final Symbol<Name> NULL_QUEUE = SYMBOLS.putName("NULL_QUEUE");
818819
public static final Symbol<Name> pending = SYMBOLS.putName("pending");
819820
public static final Symbol<Name> processPendingLock = SYMBOLS.putName("processPendingLock");
820821
public static final Symbol<Name> queue = SYMBOLS.putName("queue");

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,10 @@ public Meta(EspressoContext context) {
752752
java_lang_ref_Reference_next = java_lang_ref_Reference.requireDeclaredField(Names.next, Types.java_lang_ref_Reference);
753753
java_lang_ref_Reference_queue = java_lang_ref_Reference.requireDeclaredField(Names.queue, Types.java_lang_ref_ReferenceQueue);
754754
java_lang_ref_ReferenceQueue = knownKlass(Types.java_lang_ref_ReferenceQueue);
755-
java_lang_ref_ReferenceQueue_NULL = java_lang_ref_ReferenceQueue.requireDeclaredField(Names.NULL, Types.java_lang_ref_ReferenceQueue);
755+
java_lang_ref_ReferenceQueue_NULL = diff() //
756+
.field(VERSION_24_OR_LOWER, Names.NULL, Types.java_lang_ref_ReferenceQueue) //
757+
.field(VERSION_25_OR_HIGHER, Names.NULL_QUEUE, Types.java_lang_ref_ReferenceQueue) //
758+
.field(java_lang_ref_ReferenceQueue);
756759

757760
java_lang_ref_WeakReference = knownKlass(Types.java_lang_ref_WeakReference);
758761
java_lang_ref_SoftReference = knownKlass(Types.java_lang_ref_SoftReference);

0 commit comments

Comments
 (0)