Make arguments of n-ary message nodes concrete

Do not use array of node children, instead make these nodes have explicit child nodes.
This solves an issue with escaping frames, and avoids the additional indirection of the array.

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

Author: smarr

src/som/interpreter/Method.java

@@ -142,7 +142,7 @@ public ExpressionNode inline(final CallTarget inlinableCallTarget, final SSymbol
             inlinableCallTarget, frameDescriptor, selfSlot, nonLocalReturnMarker,
             argumentSlots, temporarySlots);
       case 2:
-        return new TernaryInlinedMethod(selector, universe, body, null, null,
+        return new TernaryInlinedMethod(selector, universe, body, null, null, null,
             inlinableCallTarget, frameDescriptor, selfSlot, nonLocalReturnMarker,
             argumentSlots, temporarySlots);
       default:
@@ -216,9 +216,9 @@ public ExpressionNode getReceiver() {
   }
 
   private static final class BinaryInlinedMethod extends BinaryMessageNode implements InlinedCallSite {
-    @Child    private ExpressionNode   expressionOrSequence;
-    @Child    private ExpressionNode   receiver;
-    @Children private ExpressionNode[] arguments;
+    @Child private ExpressionNode expressionOrSequence;
+    @Child private ExpressionNode receiver;
+    @Child private ExpressionNode argument;
 
     private final CallTarget      callTarget;
     private final FrameDescriptor frameDescriptor;
@@ -230,8 +230,8 @@ private static final class BinaryInlinedMethod extends BinaryMessageNode impleme
 
     BinaryInlinedMethod(final SSymbol selector, final Universe universe,
         final ExpressionNode msgBody, final ExpressionNode receiver,
-        final ExpressionNode[] arguments,
-        final CallTarget callTarget, final FrameDescriptor frameDescriptor,
+        final ExpressionNode argument, final CallTarget callTarget,
+        final FrameDescriptor frameDescriptor,
         final FrameSlot selfSlot, final FrameSlot nonLocalReturnMarker,
         final FrameSlot[] argumentSlots,
         final FrameSlot[] temporarySlots) {
@@ -243,7 +243,7 @@ private static final class BinaryInlinedMethod extends BinaryMessageNode impleme
       this.nonLocalReturnMarker = nonLocalReturnMarker;
       this.argumentSlots        = argumentSlots;
       this.temporarySlots       = temporarySlots;
-      this.arguments            = arguments;
+      this.argument             = argument;
     }
 
     @ExplodeLoop
@@ -265,7 +265,7 @@ private FrameOnStackMarker initializeFrame(final VirtualFrame frame) {
     @Override
     public Object executeGeneric(final VirtualFrame frame) {
       Object rcvr = receiver.executeGeneric(frame);
-      Object arg  = arguments[0].executeGeneric(frame);
+      Object arg  = argument.executeGeneric(frame);
       return executeEvaluated(frame, rcvr, arg);
     }
 
@@ -288,15 +288,16 @@ public ExpressionNode getReceiver() {
     }
 
     @Override
-    public ExpressionNode[] getArguments() {
-      return arguments;
+    public ExpressionNode getArgument() {
+      return argument;
     }
   }
 
   private static final class TernaryInlinedMethod extends TernaryMessageNode implements InlinedCallSite {
-    @Child    private ExpressionNode   expressionOrSequence;
-    @Child    private ExpressionNode   receiver;
-    @Children private ExpressionNode[] arguments;
+    @Child private ExpressionNode expressionOrSequence;
+    @Child private ExpressionNode receiver;
+    @Child private ExpressionNode firstArg;
+    @Child private ExpressionNode secondArg;
 
     private final CallTarget      callTarget;
     private final FrameDescriptor frameDescriptor;
@@ -308,7 +309,7 @@ private static final class TernaryInlinedMethod extends TernaryMessageNode imple
 
     TernaryInlinedMethod(final SSymbol selector, final Universe universe,
         final ExpressionNode msgBody, final ExpressionNode receiver,
-        final ExpressionNode[] arguments,
+        final ExpressionNode firstArg, final ExpressionNode secondArg,
         final CallTarget callTarget, final FrameDescriptor frameDescriptor,
         final FrameSlot selfSlot, final FrameSlot nonLocalReturnMarker,
         final FrameSlot[] argumentSlots,
@@ -321,7 +322,8 @@ private static final class TernaryInlinedMethod extends TernaryMessageNode imple
       this.nonLocalReturnMarker = nonLocalReturnMarker;
       this.argumentSlots        = argumentSlots;
       this.temporarySlots       = temporarySlots;
-      this.arguments            = arguments;
+      this.firstArg             = firstArg;
+      this.secondArg            = secondArg;
     }
 
     @ExplodeLoop
@@ -344,8 +346,8 @@ private FrameOnStackMarker initializeFrame(final VirtualFrame frame) {
     @Override
     public Object executeGeneric(final VirtualFrame frame) {
       Object rcvr = receiver.executeGeneric(frame);
-      Object arg1 = arguments[0].executeGeneric(frame);
-      Object arg2 = arguments[1].executeGeneric(frame);
+      Object arg1 = firstArg.executeGeneric(frame);
+      Object arg2 = secondArg.executeGeneric(frame);
       return executeEvaluated(frame, rcvr, arg1, arg2);
     }
 
@@ -368,8 +370,13 @@ public ExpressionNode getReceiver() {
     }
 
     @Override
-    public ExpressionNode[] getArguments() {
-      return arguments;
+    public ExpressionNode getFirstArg() {
+      return firstArg;
+    }
+
+    @Override
+    public ExpressionNode getSecondArg() {
+      return secondArg;
     }
   }
 

src/som/interpreter/nodes/AbstractNAryMessageNode.java

@@ -3,9 +3,14 @@
 import som.vm.Universe;
 import som.vmobjects.SSymbol;
 
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public abstract class BinaryMessageNode extends AbstractNAryMessageNode {
+@NodeChildren({
+  @NodeChild(value = "receiver", type = ExpressionNode.class),
+  @NodeChild(value = "argument", type = ExpressionNode.class)})
+public abstract class BinaryMessageNode extends AbstractMessageNode {
 
   public BinaryMessageNode(final SSymbol selector, final Universe universe) {
     super(selector, universe);
@@ -16,4 +21,5 @@ public BinaryMessageNode(final BinaryMessageNode node) {
   }
 
   public abstract Object executeEvaluated(final VirtualFrame frame, final Object receiver, Object argument);
+  public abstract ExpressionNode getArgument();
 }

src/som/interpreter/nodes/BinaryMessageNode.java

@@ -48,17 +48,17 @@ public static UnaryMessageNode createUnaryMessageNode(final SSymbol selector, fi
   }
 
   public static BinaryMessageNode createBinaryMessageNode(final SSymbol selector, final Universe universe, final ExpressionNode receiver, final ExpressionNode arg) {
-    return BinarySendNode.create(selector, universe, receiver, new ExpressionNode[] {arg});
+    return BinarySendNode.create(selector, universe, receiver, arg);
   }
 
   public static AbstractMessageNode createMessageNode(final SSymbol selector, final Universe universe, final ExpressionNode receiver, final ExpressionNode[] arguments) {
     switch (arguments.length) {
       case 0:
         return createUnaryMessageNode(selector, universe, receiver);
       case 1:
-        return BinarySendNode.create(selector, universe, receiver, arguments);
+        return BinarySendNode.create(selector, universe, receiver, arguments[0]);
       case 2:
-        return TernarySendNode.create(selector, universe, receiver, arguments);
+        return TernarySendNode.create(selector, universe, receiver, arguments[0], arguments[1]);
       default:
         ArgumentEvaluationNode args = new ArgumentEvaluationNode(arguments);
         return KeywordSendNode.create(selector, universe, receiver, args);

src/som/interpreter/nodes/NodeFactory.java

@@ -3,9 +3,15 @@
 import som.vm.Universe;
 import som.vmobjects.SSymbol;
 
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public abstract class TernaryMessageNode extends AbstractNAryMessageNode {
+@NodeChildren({
+  @NodeChild(value = "receiver",  type = ExpressionNode.class),
+  @NodeChild(value = "firstArg",  type = ExpressionNode.class),
+  @NodeChild(value = "secondArg", type = ExpressionNode.class)})
+public abstract class TernaryMessageNode extends AbstractMessageNode {
   public TernaryMessageNode(final SSymbol selector, final Universe universe) {
     super(selector, universe);
   }
@@ -15,4 +21,6 @@ public TernaryMessageNode(final TernaryMessageNode node) {
   }
 
   public abstract Object executeEvaluated(final VirtualFrame frame, final Object receiver, Object firstArg, Object secondArg);
+  public abstract ExpressionNode getFirstArg();
+  public abstract ExpressionNode getSecondArg();
 }

src/som/interpreter/nodes/TernaryMessageNode.java

@@ -6,8 +6,6 @@
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-//@NodeChild(value = "exp", type = ExpressionNode.class)
-//abstract
 public class VariableWriteNode extends VariableNode {
   @Child private ExpressionNode exp;
 

src/som/interpreter/nodes/VariableWriteNode.java

@@ -22,19 +22,19 @@
 
 public abstract class BinarySendNode extends BinaryMessageNode {
 
-  @Child    protected ExpressionNode   receiverExpr;
-  @Children protected ExpressionNode[] argumentsNodes;
+  @Child protected ExpressionNode   receiverExpr;
+  @Child protected ExpressionNode   argumentNode;
 
   private BinarySendNode(final SSymbol selector,
       final Universe universe, final ExpressionNode receiver,
-      final ExpressionNode[] arguments) {
+      final ExpressionNode argument) {
     super(selector, universe);
-    this.receiverExpr   = adoptChild(receiver);
-    this.argumentsNodes = adoptChildren(arguments);
+    this.receiverExpr = adoptChild(receiver);
+    this.argumentNode = adoptChild(argument);
   }
 
   private BinarySendNode(final BinarySendNode node) {
-    this(node.selector, node.universe, node.receiverExpr, node.argumentsNodes);
+    this(node.selector, node.universe, node.receiverExpr, node.argumentNode);
   }
 
   @Override
@@ -43,21 +43,21 @@ public ExpressionNode getReceiver() {
   }
 
   @Override
-  public ExpressionNode[] getArguments() {
-    return argumentsNodes;
+  public ExpressionNode getArgument() {
+    return argumentNode;
   }
 
   @Override
   public final Object executeGeneric(final VirtualFrame frame) {
     Object receiverValue = receiverExpr.executeGeneric(frame);
-    Object argument = argumentsNodes[0].executeGeneric(frame);
+    Object argument = argumentNode.executeGeneric(frame);
     return executeEvaluated(frame, receiverValue, argument);
   }
 
   public static BinarySendNode create(final SSymbol selector,
       final Universe universe, final ExpressionNode receiver,
-      final ExpressionNode[] arguments) {
-    return new UninitializedSendNode(selector, universe, receiver, arguments, 0);
+      final ExpressionNode argument) {
+    return new UninitializedSendNode(selector, universe, receiver, argument, 0);
   }
 
   private static final class CachedSendNode extends BinarySendNode {
@@ -91,9 +91,9 @@ private static final class UninitializedSendNode extends BinarySendNode {
     protected final int depth;
 
     UninitializedSendNode(final SSymbol selector, final Universe universe,
-        final ExpressionNode receiver, final ExpressionNode[] arguments,
+        final ExpressionNode receiver, final ExpressionNode argument,
         final int depth) {
-      super(selector, universe, receiver, arguments);
+      super(selector, universe, receiver, argument);
       this.depth = depth;
     }
 

src/som/interpreter/nodes/messages/BinarySendNode.java

@@ -22,19 +22,21 @@
 
 public abstract class TernarySendNode extends TernaryMessageNode {
 
-  @Child    protected ExpressionNode   receiverExpr;
-  @Children protected ExpressionNode[] argumentsNodes;
+  @Child protected ExpressionNode receiverExpr;
+  @Child protected ExpressionNode firstArgNode;
+  @Child protected ExpressionNode secondArgNode;
 
   private TernarySendNode(final SSymbol selector,
       final Universe universe, final ExpressionNode receiver,
-      final ExpressionNode[] arguments) {
+      final ExpressionNode firstArg, final ExpressionNode secondArg) {
     super(selector, universe);
-    this.receiverExpr   = adoptChild(receiver);
-    this.argumentsNodes = adoptChildren(arguments);
+    this.receiverExpr  = adoptChild(receiver);
+    this.firstArgNode  = adoptChild(firstArg);
+    this.secondArgNode = adoptChild(secondArg);
   }
 
   private TernarySendNode(final TernarySendNode node) {
-    this(node.selector, node.universe, node.receiverExpr, node.argumentsNodes);
+    this(node.selector, node.universe, node.receiverExpr, node.firstArgNode, node.secondArgNode);
   }
 
   @Override
@@ -43,22 +45,27 @@ public ExpressionNode getReceiver() {
   }
 
   @Override
-  public ExpressionNode[] getArguments() {
-    return argumentsNodes;
+  public ExpressionNode getFirstArg() {
+    return firstArgNode;
+  }
+
+  @Override
+  public ExpressionNode getSecondArg() {
+    return secondArgNode;
   }
 
   @Override
   public final Object executeGeneric(final VirtualFrame frame) {
     Object receiverValue = receiverExpr.executeGeneric(frame);
-    Object argument1 = argumentsNodes[0].executeGeneric(frame);
-    Object argument2 = argumentsNodes[1].executeGeneric(frame);
+    Object argument1 = firstArgNode.executeGeneric(frame);
+    Object argument2 = secondArgNode.executeGeneric(frame);
     return executeEvaluated(frame, receiverValue, argument1, argument2);
   }
 
   public static TernarySendNode create(final SSymbol selector,
       final Universe universe, final ExpressionNode receiver,
-      final ExpressionNode[] arguments) {
-    return new UninitializedSendNode(selector, universe, receiver, arguments, 0);
+      final ExpressionNode firstArg, final ExpressionNode secondArg) {
+    return new UninitializedSendNode(selector, universe, receiver, firstArg, secondArg, 0);
   }
 
   private static final class CachedSendNode extends TernarySendNode {
@@ -92,9 +99,9 @@ private static final class UninitializedSendNode extends TernarySendNode {
     protected final int depth;
 
     UninitializedSendNode(final SSymbol selector, final Universe universe,
-        final ExpressionNode receiver, final ExpressionNode[] arguments,
-        final int depth) {
-      super(selector, universe, receiver, arguments);
+        final ExpressionNode receiver, final ExpressionNode firstArg,
+        final ExpressionNode secondArg, final int depth) {
+      super(selector, universe, receiver, firstArg, secondArg);
       this.depth = depth;
     }
 

src/som/interpreter/nodes/messages/TernarySendNode.java

@@ -79,10 +79,10 @@ public static SMethod constructPrimitive(final SSymbol signature,
           new SelfReadNode(mgen.getSelfSlot(), 0));
     } else if (numArgs == 1) {
       primNode = nodeFactory.createNode(signature, universe,
-          new SelfReadNode(mgen.getSelfSlot(), 0), args);
+          new SelfReadNode(mgen.getSelfSlot(), 0), args[0]);
     } else if (numArgs == 2) {
       primNode = nodeFactory.createNode(signature, universe,
-          new SelfReadNode(mgen.getSelfSlot(), 0), args);
+          new SelfReadNode(mgen.getSelfSlot(), 0), args[0], args[1]);
     } else {
       ArgumentEvaluationNode argEvalNode = new ArgumentEvaluationNode(args);
       primNode = nodeFactory.createNode(signature, universe,