Fix unwrapping of far references for self sends

Signed-off-by: Stefan Marr <git@stefan-marr.de>
smarr · Apr 27, 2020 · e1e3d26 · e1e3d26
1 parent 02da734
commit e1e3d26
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/som/interpreter/actors/WrapReferenceNode.java b/src/som/interpreter/actors/WrapReferenceNode.java
@@ -13,7 +13,11 @@ public abstract class WrapReferenceNode extends Node {
 
   public abstract Object execute(Object ref, Actor target, Actor owner);
 
-  @Specialization(guards = "target == owner")
+  protected static final boolean notFarRef(final Object ref) {
+    return !(ref instanceof SFarReference);
+  }
+
+  @Specialization(guards = {"target == owner", "notFarRef(ref)"})
   public Object inSameActor(final Object ref, final Actor target, final Actor owner) {
     return ref;
   }