Don't let the FrameSlot escape to a Block object, take the origin tree node, and let it handled the operation with the FrameSlot

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Author: smarr

src/som/interpreter/nodes/literals/BlockNode.java

@@ -6,10 +6,11 @@
 import som.vm.Universe;
 import som.vmobjects.SBlock;
 import som.vmobjects.SInvokable;
-import som.vmobjects.SInvokable.SPrimitive;
 import som.vmobjects.SInvokable.SMethod;
 
 import com.oracle.truffle.api.frame.FrameSlot;
+import com.oracle.truffle.api.frame.FrameUtil;
+import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo.Kind;
 
@@ -69,9 +70,13 @@ public BlockNodeWithContext(final BlockNodeWithContext node,
       this(node.blockMethod, node.universe, inlinedOuterSelfSlot, node.contextLevel);
     }
 
+    public Object getOuterSelf(final MaterializedFrame frame) {
+      return FrameUtil.getObjectSafe(frame, outerSelfSlot);
+    }
+
     @Override
     public SBlock executeSBlock(final VirtualFrame frame) {
-      return universe.newBlock(blockMethod, frame.materialize(), outerSelfSlot);
+      return universe.newBlock(blockMethod, frame.materialize(), this);
     }
 
     @Override

src/som/vm/Universe.java

@@ -34,6 +34,7 @@
 
 import som.compiler.Disassembler;
 import som.interpreter.Invokable;
+import som.interpreter.nodes.literals.BlockNode.BlockNodeWithContext;
 import som.vmobjects.SAbstractObject;
 import som.vmobjects.SArray;
 import som.vmobjects.SBigInteger;
@@ -52,7 +53,6 @@
 import com.oracle.truffle.api.CompilerDirectives.SlowPath;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleRuntime;
-import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 
 public class Universe {
@@ -414,8 +414,8 @@ public SArray newArray(final String[] stringArray) {
   }
 
   public SBlock newBlock(final SMethod method, final MaterializedFrame context,
-      final FrameSlot outerSelfSlot) {
-    return SBlock.create(method, context, outerSelfSlot);
+      final BlockNodeWithContext originNode) {
+    return SBlock.create(method, context, originNode);
   }
 
   @SlowPath

src/som/vmobjects/SBlock.java

@@ -24,6 +24,7 @@
 
 package som.vmobjects;
 
+import som.interpreter.nodes.literals.BlockNode.BlockNodeWithContext;
 import som.primitives.BlockPrimsFactory.ValueMorePrimFactory;
 import som.primitives.BlockPrimsFactory.ValueNonePrimFactory;
 import som.primitives.BlockPrimsFactory.ValueOnePrimFactory;
@@ -32,26 +33,24 @@
 import som.vm.Universe;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.frame.FrameSlot;
-import com.oracle.truffle.api.frame.FrameUtil;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 
 public abstract class SBlock extends SAbstractObject {
 
   public static SBlock create(final SInvokable blockMethod,
-      final MaterializedFrame context, final FrameSlot outerSelfSlot) {
+      final MaterializedFrame context, final BlockNodeWithContext originNode) {
     switch (blockMethod.getNumberOfArguments()) {
-      case 1: return new SBlock1(blockMethod, context, outerSelfSlot);
-      case 2: return new SBlock2(blockMethod, context, outerSelfSlot);
-      case 3: return new SBlock3(blockMethod, context, outerSelfSlot);
+      case 1: return new SBlock1(blockMethod, context, originNode);
+      case 2: return new SBlock2(blockMethod, context, originNode);
+      case 3: return new SBlock3(blockMethod, context, originNode);
     }
     throw new RuntimeException("We do currently not have support for more than 3 arguments to a block.");
   }
 
   public static final class SBlock1 extends SBlock {
     public SBlock1(final SInvokable blockMethod, final MaterializedFrame context,
-        final FrameSlot outerSelfSlot) {
-      super(blockMethod, context, outerSelfSlot);
+        final BlockNodeWithContext originNode) {
+      super(blockMethod, context, originNode);
     }
 
     @Override
@@ -62,8 +61,8 @@ public SClass getSOMClass(final Universe universe) {
 
   public static final class SBlock2 extends SBlock {
     public SBlock2(final SInvokable blockMethod, final MaterializedFrame context,
-        final FrameSlot outerSelfSlot) {
-      super(blockMethod, context, outerSelfSlot);
+        final BlockNodeWithContext originNode) {
+      super(blockMethod, context, originNode);
     }
 
     @Override
@@ -74,8 +73,8 @@ public SClass getSOMClass(final Universe universe) {
 
   public static final class SBlock3 extends SBlock {
     public SBlock3(final SInvokable blockMethod, final MaterializedFrame context,
-        final FrameSlot outerSelfSlot) {
-      super(blockMethod, context, outerSelfSlot);
+        final BlockNodeWithContext originNode) {
+      super(blockMethod, context, originNode);
     }
 
     @Override
@@ -85,10 +84,10 @@ public SClass getSOMClass(final Universe universe) {
   }
 
   public SBlock(final SInvokable blockMethod, final MaterializedFrame context,
-      final FrameSlot outerSelfSlot) {
+      final BlockNodeWithContext originNode) {
     this.method   = blockMethod;
     this.context  = context;
-    this.outerSelfSlot = outerSelfSlot;
+    this.originNode = originNode;
   }
 
   public final SInvokable getMethod() {
@@ -101,7 +100,7 @@ public final  MaterializedFrame getContext() {
   }
 
   public final Object getOuterSelf() {
-    return FrameUtil.getObjectSafe(getContext(), outerSelfSlot);
+    return originNode.getOuterSelf(context);
   }
 
   public static SInvokable getEvaluationPrimitive(final int numberOfArguments,
@@ -137,5 +136,5 @@ private static String computeSignatureString(final int numberOfArguments) {
 
   private final SInvokable           method;
   private final MaterializedFrame context;
-  private final FrameSlot         outerSelfSlot;
+  private final BlockNodeWithContext originNode;
 }