Merge branch 'master' into truffle-head

jruby · Mar 22, 2016 · a63f1cf · a63f1cf
2 parents 962999a + 8d8640d
commit a63f1cf
Showing 20 changed files with 8 additions and 441 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/AbstractExecuteMethodNode.java b/truffle/src/main/java/org/jruby/truffle/interop/AbstractExecuteMethodNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ExecuteMethodNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ExecuteMethodNode.java
@@ -30,7 +30,7 @@
 import java.util.List;
 
 @NodeChild(value="method", type = RubyNode.class)
-public abstract class ExecuteMethodNode extends AbstractExecuteMethodNode {
+public abstract class ExecuteMethodNode extends RubyNode {
     @Child private IndirectCallNode callNode;
     public ExecuteMethodNode(RubyContext context,
                              SourceSection sourceSection) {
@@ -74,10 +74,6 @@ protected Object doCall(VirtualFrame frame, DynamicObject method) {
         return callNode.call(frame, internalMethod.getCallTarget(), RubyArguments.pack(null, null, internalMethod, DeclarationContext.METHOD, null, Layouts.METHOD.getReceiver(method), null, args));
     }
 
-    protected InternalMethod getMethodFromProc(DynamicObject proc) {
-        return Layouts.PROC.getMethod(proc);
-    }
-
     protected CallTarget getCallTarget(DynamicObject proc) {
         return Layouts.PROC.getCallTargetForType(proc);
     }
@@ -86,4 +82,5 @@ protected InternalMethod getMethod(DynamicObject method) {
         return Layouts.METHOD.getMethod(method);
     }
 
+    public abstract Object executeWithTarget(VirtualFrame frame, Object method);
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteNode.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.AcceptMessage;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.RubyLanguage;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignGetSizeNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignGetSizeNode.java
@@ -15,6 +15,7 @@
 import com.oracle.truffle.api.interop.AcceptMessage;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.RubyLanguage;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignInvokeNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignInvokeNode.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.AcceptMessage;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.RubyLanguage;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignIsNullNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignIsNullNode.java
@@ -14,6 +14,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.AcceptMessage;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.RubyLanguage;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadNode.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.AcceptMessage;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.RubyLanguage;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignWriteNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignWriteNode.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.AcceptMessage;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.RubyLanguage;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropArgumentNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropArgumentsNode.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropArgumentsNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropGetSizeProperty.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropGetSizeProperty.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropHasSize.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropHasSize.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropIsExecutable.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropIsExecutable.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropIsNull.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropIsNull.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropStringIsBoxed.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropStringIsBoxed.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropStringUnboxNode.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropStringUnboxNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropExecuteAfterReadNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropExecuteAfterReadNode.java
@@ -24,7 +24,6 @@
 public class ResolvedInteropExecuteAfterReadNode extends RubyNode {
 
     @Child private DispatchHeadNode head;
-    @Child private InteropArgumentsNode arguments;
     private final String name;
     private final int labelIndex;
     private final int receiverIndex;
@@ -33,16 +32,13 @@ public ResolvedInteropExecuteAfterReadNode(RubyContext context, SourceSection so
         super(context, sourceSection);
         this.name = name;
         this.head = new DispatchHeadNode(context, true, MissingBehavior.CALL_METHOD_MISSING, DispatchAction.CALL_METHOD);
-        this.arguments = new InteropArgumentsNode(context, sourceSection, arity); // [0] is receiver, [1] is the label
         this.labelIndex = 1;
         this.receiverIndex = 0;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
         if (name.equals(frame.getArguments()[labelIndex])) {
-            //Object[] args = new Object[arguments.getCount(frame)];
-            //arguments.executeFillObjectArray(frame, args);
             final List<Object> arguments = ForeignAccess.getArguments(frame);
             return head.dispatch(frame, frame.getArguments()[receiverIndex], frame.getArguments()[labelIndex], null, arguments.subList(1, arguments.size()).toArray());
         } else {

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/RubyForeignAccessFactory.java b/truffle/src/main/java/org/jruby/truffle/interop/RubyForeignAccessFactory.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/RubyInteropRootNode.java b/truffle/src/main/java/org/jruby/truffle/interop/RubyInteropRootNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java b/truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java
@@ -16,7 +16,6 @@
 import com.oracle.truffle.api.object.ObjectType;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
-import org.jruby.truffle.interop.RubyForeignAccessFactory;
 import org.jruby.truffle.core.rope.RopeOperations;
 import org.jruby.truffle.core.string.StringOperations;