Merge 34e8d1f into 02da734

smarr · Apr 27, 2020 · 9e27350 · 9e27350
2 parents 02da734 + 34e8d1f
commit 9e27350
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core-lib/Kernel.ns b/core-lib/Kernel.ns
@@ -791,6 +791,8 @@ class Kernel vmMirror: vmMirror = Object <: Value (
 
     (* Preserves capacity *)
     public removeAll = (
+      firstIdx:: 1.
+      lastIdx:: 1.
       storage:: Array new: storage size.
     )
 

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;
   }