jruby · Jan 7, 2015 · Jan 7, 2015
diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -62,7 +62,7 @@ public Object isDefined(VirtualFrame frame) {
         return getContext().makeString("expression");
     }
 
-    public String executeJavaString(VirtualFrame frame) throws UnexpectedResultException {
+    public String executeString(VirtualFrame frame) throws UnexpectedResultException {
         return RubyTypesGen.RUBYTYPES.expectString(execute(frame));
     }
 
@@ -170,7 +170,7 @@ public RubyTime executeRubyTime(VirtualFrame frame) throws UnexpectedResultExcep
         return RubyTypesGen.RUBYTYPES.expectRubyTime(execute(frame));
     }
 
-    public RubyString executeString(VirtualFrame frame) throws UnexpectedResultException {
+    public RubyString executeRubyString(VirtualFrame frame) throws UnexpectedResultException {
         return RubyTypesGen.RUBYTYPES.expectRubyString(execute(frame));
     }
     public RubyEncoding executeRubyEncoding(VirtualFrame frame) throws UnexpectedResultException {
@@ -189,11 +189,11 @@ public RubyEncodingConverter executeRubyEncodingConverter(VirtualFrame frame) th
         return RubyTypesGen.RUBYTYPES.expectRubyEncodingConverter(execute(frame));
     }
 
-    public Dispatch.DispatchAction executeDispatchAction(VirtualFrame frame) {
+    public Dispatch.DispatchAction executeDispatchAction(VirtualFrame frame) throws UnexpectedResultException {
         throw new UnsupportedOperationException();
     }
 
-    public LexicalScope executeLexicalScope(VirtualFrame frame) {
+    public LexicalScope executeLexicalScope(VirtualFrame frame) throws UnexpectedResultException {
         throw new UnsupportedOperationException();
     }
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java b/core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes;
 
 import com.oracle.truffle.api.dsl.TypeSystem;
+import com.oracle.truffle.api.dsl.internal.DSLOptions;
 import com.oracle.truffle.api.interop.TruffleObject;
 import org.jruby.truffle.nodes.dispatch.Dispatch;
 import org.jruby.truffle.runtime.LexicalScope;
@@ -20,6 +21,7 @@
  * The list of types and type conversions that the AST interpreter knows about and can specialise
  * using. Used by the DSL.
  */
+@DSLOptions(useNewLayout=true)
 @TypeSystem({ //
                 Dispatch.DispatchAction.class, //
                 LexicalScope.class, //

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java
@@ -67,4 +67,9 @@ public boolean doBasicObject(RubyBasicObject object) {
 
     public abstract boolean executeBoolean(VirtualFrame frame, Object value);
 
+    @Override
+    public final Object execute(VirtualFrame frame) {
+        return executeBoolean(frame);
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java
@@ -45,7 +45,7 @@ public Object doProc(RubyProc proc) {
     }
 
     @Override
-    public RubyProc executeRubyProc(VirtualFrame frame) {
+    public final RubyProc executeRubyProc(VirtualFrame frame) {
         final Object proc = execute(frame);
 
         // The standard asRubyProc test doesn't allow for null

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/ToSNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/ToSNode.java
@@ -49,7 +49,7 @@ public ToSNode(ToSNode prev) {
     }
 
     @Override
-    public abstract RubyString executeString(VirtualFrame frame);
+    public abstract RubyString executeRubyString(VirtualFrame frame);
 
     @Specialization
     public RubyString toS(RubyString string) {
@@ -71,4 +71,10 @@ public RubyString toSFallback(VirtualFrame frame, Object object) {
             return kernelToS(frame, object);
         }
     }
+
+    @Override
+    public final Object execute(VirtualFrame frame) {
+        return executeRubyString(frame);
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/OrNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
@@ -27,7 +27,6 @@ public class OrNode extends RubyNode {
     @Child protected RubyNode right;
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
-
     public OrNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {
         super(context, sourceSection);
         this.left = left;

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
@@ -285,7 +285,7 @@ public PowNode(PowNode prev) {
         }
 
         @Specialization(guards = "canShiftIntoInt")
-        public int pow2(int a, int b) {
+        public int powTwo(int a, int b) {
             return 1 << b;
         }
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java
@@ -47,7 +47,7 @@ public Object execute(VirtualFrame frame) {
         boolean tainted = false;
 
         for (int n = 0; n < children.length; n++) {
-            final RubyString toInterpolate = children[n].executeString(frame);
+            final RubyString toInterpolate = children[n].executeRubyString(frame);
             strings[n] = toInterpolate;
             tainted |= taintedNode.tainted(toInterpolate);
         }

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -312,7 +312,7 @@ public BindingNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
-        public abstract RubyBinding executeBinding(VirtualFrame frame);
+        public abstract RubyBinding executeRubyBinding(VirtualFrame frame);
 
         @Specialization
         public RubyBinding binding() {
@@ -430,7 +430,7 @@ public ClassNode(ClassNode prev) {
             super(prev);
         }
 
-        public abstract RubyClass executeGetClass(Object value);
+        public abstract RubyClass executeGetClass(VirtualFrame frame, Object value);
 
         @Specialization
         public RubyClass getClass(boolean value) {
@@ -561,7 +561,7 @@ protected RubyBinding getCallerBinding(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 bindingNode = insert(KernelNodesFactory.BindingNodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{}));
             }
-            return bindingNode.executeBinding(frame);
+            return bindingNode.executeRubyBinding(frame);
         }
 
         @Specialization
@@ -1198,7 +1198,7 @@ public IsANode(IsANode prev) {
             super(prev);
         }
 
-        public abstract boolean executeBoolean(Object self, RubyClass rubyClass);
+        public abstract boolean executeIsA(VirtualFrame frame, Object self, RubyClass rubyClass);
 
         @Specialization
         public boolean isA(RubyBasicObject self, RubyNilClass nil) {
@@ -1816,7 +1816,7 @@ public SingletonClassMethodNode(SingletonClassMethodNode prev) {
 
         @Specialization
         public RubyClass singletonClass(Object self) {
-            return singletonClassNode.executeSingletonClass(self);
+            return singletonClassNode.singletonClass(self);
         }
 
     }
@@ -2162,7 +2162,7 @@ public ToHexStringNode(ToHexStringNode prev) {
             super(prev);
         }
 
-        public abstract String executeToHexString(Object value);
+        public abstract String executeToHexString(VirtualFrame frame, Object value);
 
         @Specialization
         public String toHexString(int value) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java
@@ -203,23 +203,4 @@ public Object dispatch(
         }
     }
 
-    @Fallback
-    public Object dispatch(
-            VirtualFrame frame,
-            LexicalScope lexicalScope,
-            Object receiverObject,
-            Object methodName,
-            Object blockObject,
-            Object argumentsObjects,
-            Dispatch.DispatchAction dispatchAction) {
-        return next.executeDispatch(
-                frame,
-                lexicalScope,
-                receiverObject,
-                methodName,
-                blockObject,
-                argumentsObjects,
-                dispatchAction);
-    }
-
-}
+}
diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
@@ -153,25 +153,6 @@ public Object dispatch(
         }
     }
 
-    @Fallback
-    public Object dispatch(
-            VirtualFrame frame,
-            LexicalScope lexicalScope,
-            Object receiverObject,
-            Object methodName,
-            Object blockObject,
-            Object argumentsObjects,
-            Dispatch.DispatchAction dispatchAction) {
-        return next.executeDispatch(
-                frame,
-                lexicalScope,
-                receiverObject,
-                methodName,
-                CompilerDirectives.unsafeCast(blockObject, RubyProc.class, true, false),
-                argumentsObjects,
-                dispatchAction);
-    }
-
     @Override
     public String toString() {
         return String.format("CachedBoxedDispatchNode(:%s, %s@%x, %s, %s)",

diff --git a/.../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java b/.../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java
@@ -174,24 +174,4 @@ public Object dispatch(
         }
     }
 
-
-    @Fallback
-    public Object dispatch(
-            VirtualFrame frame,
-            LexicalScope lexicalScope,
-            Object receiverObject,
-            Object methodName,
-            Object blockObject,
-            Object argumentsObjects,
-            Dispatch.DispatchAction dispatchAction) {
-        return next.executeDispatch(
-                frame,
-                lexicalScope,
-                receiverObject,
-                methodName,
-                CompilerDirectives.unsafeCast(blockObject, RubyProc.class, true, false),
-                argumentsObjects, dispatchAction);
-    }
-
-
 }
diff --git a/.../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedReturnMissingDispatchNode.java b/.../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedReturnMissingDispatchNode.java
@@ -91,23 +91,4 @@ public Object dispatch(
         }
     }
 
-    @Fallback
-    public Object dispatch(
-            VirtualFrame frame,
-            LexicalScope lexicalScope,
-            Object receiverObject,
-            Object methodName,
-            Object blockObject,
-            Object argumentsObjects,
-            Dispatch.DispatchAction dispatchAction) {
-        return next.executeDispatch(
-                frame,
-                lexicalScope,
-                receiverObject,
-                methodName,
-                CompilerDirectives.unsafeCast(blockObject, RubyProc.class, true, false),
-                argumentsObjects,
-                dispatchAction);
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java
@@ -123,23 +123,4 @@ public Object dispatch(
         }
     }
 
-    @Fallback
-    public Object dispatch(
-            VirtualFrame frame,
-            LexicalScope lexicalScope,
-            Object receiverObject,
-            Object methodName,
-            Object blockObject,
-            Object argumentsObjects,
-            Dispatch.DispatchAction dispatchAction) {
-        return next.executeDispatch(
-                frame,
-                lexicalScope,
-                receiverObject,
-                methodName,
-                CompilerDirectives.unsafeCast(blockObject, RubyProc.class, true, false),
-                argumentsObjects,
-                dispatchAction);
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java
@@ -9,6 +9,8 @@
  */
 package org.jruby.truffle.nodes.dispatch;
 
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.runtime.LexicalScope;
 import org.jruby.truffle.runtime.RubyContext;
@@ -77,6 +79,25 @@ protected final boolean guardName(
         }
     }
 
+    @Fallback
+    public Object dispatch(
+            VirtualFrame frame,
+            Object lexicalScope,
+            Object receiverObject,
+            Object methodName,
+            Object blockObject,
+            Object argumentsObjects,
+            Object dispatchAction) {
+        return next.executeDispatch(
+                frame,
+                (LexicalScope) lexicalScope,
+                receiverObject,
+                methodName,
+                blockObject,
+                argumentsObjects,
+                (Dispatch.DispatchAction) dispatchAction);
+    }
+
     protected RubySymbol getCachedNameAsSymbol() {
         return cachedNameAsSymbol;
     }

diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java
@@ -133,25 +133,6 @@ public Object dispatch(
         }
     }
 
-    @Fallback
-    public Object dispatchFallback(
-            VirtualFrame frame,
-            LexicalScope lexicalScope,
-            Object receiverObject,
-            Object methodName,
-            Object blockObject,
-            Object argumentsObjects,
-            Dispatch.DispatchAction dispatchAction) {
-        return next.executeDispatch(
-                frame,
-                lexicalScope,
-                receiverObject,
-                methodName,
-                CompilerDirectives.unsafeCast(blockObject, RubyProc.class, true, false),
-                argumentsObjects,
-                dispatchAction);
-    }
-
     protected static final boolean isPrimitive(
             LexicalScope lexicalScope,
             Object receiverObject,

diff --git a/core/src/main/java/org/jruby/truffle/nodes/objects/SingletonClassNode.java b/core/src/main/java/org/jruby/truffle/nodes/objects/SingletonClassNode.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
@@ -33,7 +34,7 @@ public SingletonClassNode(SingletonClassNode prev) {
         super(prev);
     }
 
-    public abstract RubyClass executeSingletonClass(Object value);
+    public abstract RubyClass executeSingletonClass(VirtualFrame frame, Object value);
 
     @Specialization(guards = "isTrue")
     protected RubyClass singletonClassTrue(boolean value) {
@@ -46,19 +47,19 @@ protected RubyClass singletonClassFalse(boolean value) {
     }
 
     @Specialization
-    protected Object singletonClass(int value) {
+    protected RubyClass singletonClass(int value) {
         CompilerDirectives.transferToInterpreter();
         throw new RaiseException(getContext().getCoreLibrary().typeErrorCantDefineSingleton(this));
     }
 
     @Specialization
-    protected Object singletonClass(long value) {
+    protected RubyClass singletonClass(long value) {
         CompilerDirectives.transferToInterpreter();
         throw new RaiseException(getContext().getCoreLibrary().typeErrorCantDefineSingleton(this));
     }
 
     @Specialization
-    protected Object singletonClass(double value) {
+    protected RubyClass singletonClass(double value) {
         CompilerDirectives.transferToInterpreter();
         throw new RaiseException(getContext().getCoreLibrary().typeErrorCantDefineSingleton(this));
     }