Skip to content

Commit 6fecfdf

Browse files
Fix closeScope0 substitutions: those are instance methods
1 parent ba20083 commit 6fecfdf

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/standard/Target_jdk_internal_misc_ScopedMemoryAccess.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ public static void registerNatives() {
6161
/* nop */
6262
}
6363

64-
@Substitution
64+
@Substitution(hasReceiver = true)
6565
@TruffleBoundary
66-
public static boolean closeScope0(@JavaType(internalName = "Ljdk/internal/foreign/MemorySessionImpl;") StaticObject session, @Inject EspressoContext context) {
66+
public static boolean closeScope0(@SuppressWarnings("unused") StaticObject self, @JavaType(internalName = "Ljdk/internal/foreign/MemorySessionImpl;") StaticObject session,
67+
@Inject EspressoContext context) {
6768
CloseScopedMemoryAction action = new CloseScopedMemoryAction(session);
6869
Future<Void> future = context.getEnv().submitThreadLocal(null, action);
6970
TruffleSafepoint.setBlockedThreadInterruptible(null, f -> {
@@ -76,14 +77,14 @@ public static void registerNatives() {
7677
return !action.found;
7778
}
7879

79-
@Substitution
80+
@Substitution(hasReceiver = true)
8081
abstract static class CloseScope0 extends SubstitutionNode {
81-
abstract void execute(@JavaType(internalName = "Ljdk/internal/foreign/MemorySessionImpl;") StaticObject session,
82+
abstract void execute(StaticObject self, @JavaType(internalName = "Ljdk/internal/foreign/MemorySessionImpl;") StaticObject session,
8283
@JavaType(internalName = "Ljdk/internal/misc/ScopedMemoryAccess$ScopedAccessError;") StaticObject error);
8384

8485
@Specialization
8586
@SuppressWarnings("unused")
86-
static void doCloseScope(StaticObject session, StaticObject err,
87+
static void doCloseScope(@SuppressWarnings("unused") StaticObject self, StaticObject session, StaticObject err,
8788
@Cached Once warn) {
8889
// GR-65277
8990
if (warn.once()) {

0 commit comments

Comments
 (0)