Skip to content

Commit 025915d

Browse files
committed
Resolved review comments.
1 parent dcf999c commit 025915d

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/ffi/nfi/NFISulongNativeAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public boolean hasFallbackSymbols() {
6464
}
6565

6666
@TruffleBoundary
67-
private static boolean isSulongLanguage(Object languageId) {
67+
private static boolean isSulongLanguage(String languageId) {
6868
return "llvm".equals(languageId);
6969
}
7070

truffle/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This changelog summarizes major changes between Truffle versions relevant to lan
3838
* GR-70086: Added `replacementOf` and `replacementMethod` attributes to `GenerateLibrary.Abstract` annotation. They enable automatic generation of legacy delegators during message library evolution, while allowing custom conversions when needed.
3939
* GR-70086 Deprecated `Message.resolve(Class<?>, String)`. Use `Message.resolveExact(Class<?>, String, Class<?>...)` with argument types instead. This deprecation was necessary as library messages are no longer unique by message name, if the previous message was deprecated.
4040

41-
* GR-69614: The methods `InteropLibrary#hasLanguage` and `InteropLibrary#getLanguage` have been replaced with `InteropLibrary#hasLanguageId` and `InteropLibrary#getLanguageId`. Language implementers are encouraged to update their code to the new API for proper support of polyglot isolates.
41+
* GR-69614: The methods `InteropLibrary#hasLanguage` and `InteropLibrary#getLanguage` have been replaced with `InteropLibrary#hasLanguageId` and `InteropLibrary#getLanguageId`. Language implementers are encouraged to update their code to the new API.
4242
* GR-69614: Added `TruffleInstrument.Env.getHostLanguage()` returning the host language info. This allows instruments to lookup the top scope of the host language using `Env.getScope(LanguageInfo)`.
4343

4444

truffle/src/com.oracle.truffle.api.bytecode/snapshot.sigtest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,8 @@ cons protected init(java.lang.Object)
677677
intf com.oracle.truffle.api.bytecode.TagTree
678678
meth protected abstract java.lang.Class<? extends com.oracle.truffle.api.TruffleLanguage<?>> getLanguage()
679679
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="25.1")
680-
meth protected abstract java.lang.String getLanguageId()
681680
meth protected java.lang.Class<?> dispatch()
681+
meth protected java.lang.String getLanguageId()
682682
meth public com.oracle.truffle.api.bytecode.BytecodeNode getBytecodeNode()
683683
meth public final java.lang.Object createDefaultScope(com.oracle.truffle.api.frame.Frame,boolean)
684684
meth public final java.lang.String toString()

truffle/src/com.oracle.truffle.api.bytecode/src/com/oracle/truffle/api/bytecode/TagTreeNode.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,18 @@ protected TagTreeNode(Object token) {
7979
* @since 24.2
8080
* @deprecated Use {@link #getLanguageId()}.
8181
*/
82-
@Deprecated(since = "25.1") // GR-69615: Remove deprecated InteropLibrary#getLanguage
82+
// GR-69615: Remove deprecated InteropLibrary#getLanguage
83+
@Deprecated(since = "25.1")
8384
protected abstract Class<? extends TruffleLanguage<?>> getLanguage();
8485

8586
/**
8687
* Returns an id of a language associated with this node.
8788
*
88-
* @since 26.0
89+
* @since 25.1
8990
*/
90-
protected abstract String getLanguageId();
91+
protected String getLanguageId() {
92+
return BytecodeAccessor.ENGINE.getLanguageId(this, getLanguage());
93+
}
9194

9295
/**
9396
* Returns the currently used {@link NodeLibrary} exports for this tag library.

0 commit comments

Comments
 (0)