OrNode is converted to DSL node

Author: horakivo

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

@@ -9,32 +9,32 @@
  */
 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.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class OrNode extends RubyContextSourceNode {
+public abstract class OrNode extends RubyContextSourceNode {
 
     @Child private RubyNode left;
     @Child private RubyNode right;
 
-    @Child private BooleanCastNode leftCast = BooleanCastNode.create();
-
-    private final CountingConditionProfile conditionProfile = CountingConditionProfile.create();
-
     public OrNode(RubyNode left, RubyNode right) {
         this.left = left;
         this.right = right;
     }
 
-    @Override
-    public Object execute(VirtualFrame frame) {
+    @Specialization
+    protected Object doOr(VirtualFrame frame,
+            @Cached BooleanCastNode leftCast,
+            @Cached InlinedCountingConditionProfile conditionProfile) {
         final Object leftValue = left.execute(frame);
 
-        if (conditionProfile.profile(leftCast.execute(leftValue))) {
+        if (conditionProfile.profile(this, leftCast.execute(leftValue))) {
             return leftValue;
         } else {
             return right.execute(frame);
@@ -43,7 +43,7 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public RubyNode cloneUninitialized() {
-        var copy = new OrNode(
+        var copy = OrNodeGen.create(
                 left.cloneUninitialized(),
                 right.cloneUninitialized());
         return copy.copyFlags(this);

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

@@ -84,7 +84,7 @@
 import org.truffleruby.language.control.NotNode;
 import org.truffleruby.language.control.OnceNode;
 import org.truffleruby.language.control.OrLazyValueDefinedNode;
-import org.truffleruby.language.control.OrNode;
+import org.truffleruby.language.control.OrNodeGen;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.control.RedoNode;
 import org.truffleruby.language.control.RetryNode;
@@ -2274,7 +2274,7 @@ public RubyNode visitOpAsgnNode(OpAsgnParseNode node) {
             RubyNode lhs = readMethod.accept(this);
             RubyNode rhs = writeMethod.accept(this);
 
-            final RubyNode controlNode = isOrOperator ? new OrNode(lhs, rhs) : new AndNode(lhs, rhs);
+            final RubyNode controlNode = isOrOperator ? OrNodeGen.create(lhs, rhs) : new AndNode(lhs, rhs);
 
             final RubyNode ret = new DefinedWrapperNode(
                     language.coreStrings.ASSIGNMENT,
@@ -2494,7 +2494,7 @@ public RubyNode visitOrNode(OrParseNode node) {
         final RubyNode x = translateNodeOrNil(sourceSection, node.getFirstNode());
         final RubyNode y = translateNodeOrNil(sourceSection, node.getSecondNode());
 
-        final RubyNode ret = new OrNode(x, y);
+        final RubyNode ret = OrNodeGen.create(x, y);
         ret.unsafeSetSourceSection(sourceSection);
         return addNewlineIfNeeded(node, ret);
     }