Fix CompiledMethod>>callTarget

hpi-swa · Oct 20, 2024 · ccbb6a3 · ccbb6a3
1 parent 360bf42
commit ccbb6a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/AbstractSqueakObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/AbstractSqueakObject.java
@@ -126,7 +126,6 @@ protected static final Object doSendGeneric(final Node node, final AbstractSquea
                 final NativeObject selector = image.toInteropSelector(message);
                 final Object methodObject = lookupNode.executeLookup(node, classNode.executeLookup(node, receiver), selector);
                 if (methodObject instanceof final CompiledCodeObject method) {
-                    assert message.getLibraryClass() == InteropLibrary.class;
                     final Object[] receiverAndArguments = new Object[message.getParameterCount()];
                     receiverAndArguments[0] = receiver;
                     for (int i = 0; i < arguments.length; i++) {

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/CompiledCodeObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/CompiledCodeObject.java
@@ -199,8 +199,13 @@ public Source getSource() {
         return executionData.source;
     }
 
+    // used by CompiledMethod>>callTarget
     public RootCallTarget getCallTargetOrNull() {
-        return getExecutionData().callTarget;
+        if (hasExecutionData()) {
+            return executionData.callTarget;
+        } else {
+            return null;
+        }
     }
 
     public RootCallTarget getCallTarget() {

diff --git a/src/image b/src/image