[Truffle] Remove abstract non-DSL execute methods in cast and coerce …

…nodes. * They are generated by the DSL anyway and likely remnants when they were not yet DSL nodes. * execute() is the same when generated, with just an extra try/catch. * Keep the execute with evaluated values above specializations for consistency.
jruby · Apr 21, 2015 · b24e393 · b24e393
1 parent 06c53b9
commit b24e393
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 34 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java
@@ -32,6 +32,8 @@ public BooleanCastNode(BooleanCastNode copy) {
         super(copy.getContext(), copy.getSourceSection());
     }
 
+    public abstract boolean executeBoolean(VirtualFrame frame, Object value);
+
     @Specialization
     public boolean doNil(RubyNilClass nil) {
         return false;
@@ -62,14 +64,4 @@ public boolean doBasicObject(RubyBasicObject object) {
         return true;
     }
 
-    @Override
-    public abstract boolean executeBoolean(VirtualFrame frame);
-
-    public abstract boolean executeBoolean(VirtualFrame frame, Object value);
-
-    @Override
-    public final Object execute(VirtualFrame frame) {
-        return executeBoolean(frame);
-    }
-
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java
@@ -58,6 +58,8 @@ public CmpIntNode(CmpIntNode prev) {
         ltNode = prev.ltNode;
     }
 
+    public abstract int executeCmpInt(VirtualFrame frame, Object value, Object receiver, Object other);
+
     @Specialization
     public int cmpInt(int value, Object receiver, Object other) {
         if (value > 0) {
@@ -126,5 +128,4 @@ public int cmpObject(VirtualFrame frame, Object value, Object receiver, Object o
         return 0;
     }
 
-    public abstract int executeIntegerFixnum(VirtualFrame frame, Object value, Object receiver, Object other);
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/ToSNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/ToSNode.java
@@ -74,9 +74,4 @@ public RubyString toSFallback(VirtualFrame frame, Object object) {
         }
     }
 
-    @Override
-    public final Object execute(VirtualFrame frame) {
-        return executeRubyString(frame);
-    }
-
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/coerce/SymbolOrToStrNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/coerce/SymbolOrToStrNode.java
@@ -76,11 +76,4 @@ public String coerceObject(VirtualFrame frame, Object object) {
         }
     }
 
-    @Override
-    public abstract String executeString(VirtualFrame frame);
-
-    @Override
-    public final Object execute(VirtualFrame frame) {
-        return executeString(frame);
-    }
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
@@ -40,6 +40,8 @@ public ToIntNode(ToIntNode prev) {
         super(prev);
     }
 
+    public abstract int executeInt(VirtualFrame frame, Object object);
+
     @Specialization
     public int coerceInt(int value) {
         return value;
@@ -104,5 +106,4 @@ private Object coerceObject(VirtualFrame frame, Object object) {
         }
     }
 
-    public abstract int executeInt(VirtualFrame frame, Object object);
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToStrNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToStrNode.java
@@ -37,6 +37,8 @@ public ToStrNode(ToStrNode prev) {
         toStrNode = prev.toStrNode;
     }
 
+    public abstract RubyString executeRubyString(VirtualFrame frame, Object object);
+
     @Specialization
     public RubyString coerceRubyString(RubyString string) {
         return string;
@@ -71,13 +73,4 @@ public RubyString coerceObject(VirtualFrame frame, Object object) {
         }
     }
 
-    @Override
-    public abstract RubyString executeRubyString(VirtualFrame frame);
-
-    public abstract RubyString executeRubyString(VirtualFrame frame, Object object);
-
-    @Override
-    public final Object execute(VirtualFrame frame) {
-        return executeRubyString(frame);
-    }
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -301,7 +301,7 @@ public Object compare(VirtualFrame frame, RubyString a, Object b) {
                     cmpIntNode = insert(CmpIntNodeFactory.create(getContext(), getSourceSection(), null, null, null));
                 }
 
-                return -(cmpIntNode.executeIntegerFixnum(frame, cmpResult, a, b));
+                return -(cmpIntNode.executeCmpInt(frame, cmpResult, a, b));
             }
 
             return nil();