IfNode is converted to DSL node

Author: horakivo

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

@@ -9,39 +9,38 @@
  */
 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 IfNode extends RubyContextSourceNode {
+public abstract class IfNode extends RubyContextSourceNode {
 
-    @Child private BooleanCastNode condition;
+    @Child private RubyNode condition;
     @Child private RubyNode thenBody;
 
-    private final CountingConditionProfile conditionProfile = CountingConditionProfile.create();
-
     public IfNode(RubyNode condition, RubyNode thenBody) {
-        this(BooleanCastNodeGen.create(condition), thenBody);
-    }
-
-    private IfNode(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 doIf(VirtualFrame frame,
+            @Cached BooleanCastNode booleanCastNode,
+            @Cached InlinedCountingConditionProfile conditionProfile) {
+        final var conditionAsBoolean = booleanCastNode.execute(condition.execute(frame));
+        if (conditionProfile.profile(this, conditionAsBoolean)) {
             return thenBody.execute(frame);
         } else {
             return nil;
         }
     }
 
+
     @Override
     public boolean canSubsumeFollowing() {
         return !thenBody.isContinuable();
@@ -54,17 +53,14 @@ public RubyNode subsumeFollowing(RubyNode following) {
 
     @Override
     public RubyNode simplifyAsTailExpression() {
-        return new IfNode(condition, thenBody.simplifyAsTailExpression()).copySourceSection(this);
+        return IfNodeGen.create(condition, thenBody.simplifyAsTailExpression()).copySourceSection(this);
     }
 
-    private RubyNode getConditionBeforeCasting() {
-        return condition.getValueNode();
-    }
 
     @Override
     public RubyNode cloneUninitialized() {
-        var copy = new IfNode(
-                getConditionBeforeCasting().cloneUninitialized(),
+        var copy = IfNodeGen.create(
+                condition.cloneUninitialized(),
                 thenBody.cloneUninitialized());
         return copy.copyFlags(this);
     }

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

@@ -76,7 +76,7 @@
 import org.truffleruby.language.control.DynamicReturnNode;
 import org.truffleruby.language.control.FrameOnStackNode;
 import org.truffleruby.language.control.IfElseNode;
-import org.truffleruby.language.control.IfNode;
+import org.truffleruby.language.control.IfNodeGen;
 import org.truffleruby.language.control.InvalidReturnNode;
 import org.truffleruby.language.control.LocalReturnNode;
 import org.truffleruby.language.control.NextNode;
@@ -1813,7 +1813,7 @@ public RubyNode visitIfNode(IfParseNode node) {
             ret.unsafeSetSourceSection(sourceSection);
         } else if (thenBody != null) {
             final RubyNode thenBodyTranslated = thenBody.accept(this);
-            ret = new IfNode(condition, thenBodyTranslated);
+            ret = IfNodeGen.create(condition, thenBodyTranslated);
             ret.unsafeSetSourceSection(sourceSection);
         } else if (elseBody != null) {
             final RubyNode elseBodyTranslated = elseBody.accept(this);
@@ -2308,7 +2308,7 @@ public RubyNode visitOpAsgnNode(OpAsgnParseNode node) {
         final SourceIndexLength sourceSection = pos;
 
         if (node.isLazy()) {
-            body = new IfNode(
+            body = IfNodeGen.create(
                     NotNodeGen.create(new IsNilNode(receiverValue.get(sourceSection).accept(this))),
                     body);
             body.unsafeSetSourceSection(sourceSection);