Refactor UnlessNode

Author: horakivo

src/main/java/org/truffleruby/language/control/UnlessNode.java

@@ -9,34 +9,30 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.profiles.CountingConditionProfile;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.profiles.InlinedCountingConditionProfile;
 import org.truffleruby.core.cast.BooleanCastNode;
-import org.truffleruby.core.cast.BooleanCastNodeGen;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class UnlessNode extends RubyContextSourceNode {
+public abstract class UnlessNode extends RubyContextSourceNode {
 
-    @Child private BooleanCastNode condition;
+    @Child private RubyNode condition;
     @Child private RubyNode thenBody;
 
-    private final CountingConditionProfile conditionProfile = CountingConditionProfile.create();
-
     public UnlessNode(RubyNode condition, RubyNode thenBody) {
-        this.condition = BooleanCastNodeGen.create(condition);
-        this.thenBody = thenBody;
-    }
-
-    public UnlessNode(BooleanCastNode condition, RubyNode thenBody) {
         this.condition = condition;
         this.thenBody = thenBody;
     }
 
-    @Override
-    public Object execute(VirtualFrame frame) {
-        if (!conditionProfile.profile(condition.execute(frame))) {
+    @Specialization
+    protected Object doUnless(VirtualFrame frame,
+            @Cached InlinedCountingConditionProfile conditionProfile,
+            @Cached BooleanCastNode booleanCastNode) {
+        if (!conditionProfile.profile(this, booleanCastNode.execute(condition.execute(frame)))) {
             return thenBody.execute(frame);
         } else {
             return nil;
@@ -55,16 +51,13 @@ public RubyNode subsumeFollowing(RubyNode following) {
 
     @Override
     public RubyNode simplifyAsTailExpression() {
-        return new UnlessNode(condition, thenBody.simplifyAsTailExpression()).copySourceSection(this);
+        return UnlessNodeGen.create(condition, thenBody.simplifyAsTailExpression()).copySourceSection(this);
     }
 
-    private RubyNode getConditionBeforeCasting() {
-        return condition.getValueNode();
-    }
 
     public RubyNode cloneUninitialized() {
-        var copy = new UnlessNode(
-                getConditionBeforeCasting().cloneUninitialized(),
+        var copy = UnlessNodeGen.create(
+                condition.cloneUninitialized(),
                 thenBody.cloneUninitialized());
         return copy.copyFlags(this);
     }

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -89,7 +89,7 @@
 import org.truffleruby.language.control.RedoNode;
 import org.truffleruby.language.control.RetryNode;
 import org.truffleruby.language.control.ReturnID;
-import org.truffleruby.language.control.UnlessNode;
+import org.truffleruby.language.control.UnlessNodeGen;
 import org.truffleruby.language.control.WhileNode;
 import org.truffleruby.language.defined.DefinedNode;
 import org.truffleruby.language.defined.DefinedWrapperNode;
@@ -1816,7 +1816,7 @@ public RubyNode visitIfNode(IfParseNode node) {
             ret.unsafeSetSourceSection(sourceSection);
         } else if (elseBody != null) {
             final RubyNode elseBodyTranslated = elseBody.accept(this);
-            ret = new UnlessNode(condition, elseBodyTranslated);
+            ret = UnlessNodeGen.create(condition, elseBodyTranslated);
             ret.unsafeSetSourceSection(sourceSection);
         } else {
             ret = sequence(sourceSection, Arrays.asList(condition, new NilLiteralNode(true)));