Refactor ToIntNode. Get rid of CreateCast

horakivo · horakivo · commit 70559baf1922 · 2023-07-14T10:03:52.000+02:00
diff --git a/src/main/java/org/truffleruby/core/array/ArrayNodes.java b/src/main/java/org/truffleruby/core/array/ArrayNodes.java
@@ -1210,8 +1210,9 @@ protected RubyArray initializeWithSizeAndValue(RubyArray array, int size, Object
 
         @Specialization(
                 guards = { "wasProvided(size)", "!isImplicitLong(size)", "wasProvided(fillingValue)" })
-        protected RubyArray initializeSizeOther(RubyArray array, Object size, Object fillingValue, Nil block) {
-            int intSize = toInt(size);
+        protected RubyArray initializeSizeOther(RubyArray array, Object size, Object fillingValue, Nil block,
+                @Cached @Shared ToIntNode toIntNode) {
+            int intSize = toIntNode.execute(size);
             return executeInitialize(array, intSize, fillingValue, block);
         }
 
@@ -1255,7 +1256,8 @@ protected RubyArray initializeFromArray(
 
         @Specialization(
                 guards = { "!isImplicitLong(object)", "wasProvided(object)", "!isRubyArray(object)" })
-        protected RubyArray initialize(RubyArray array, Object object, NotProvided unusedValue, Nil block) {
+        protected RubyArray initialize(RubyArray array, Object object, NotProvided unusedValue, Nil block,
+                @Cached @Shared ToIntNode toIntNode) {
             RubyArray copy = null;
             if (respondToToAry(object)) {
                 Object toAryResult = callToAry(object);
@@ -1267,7 +1269,7 @@ protected RubyArray initialize(RubyArray array, Object object, NotProvided unuse
             if (copy != null) {
                 return executeInitialize(array, copy, NotProvided.INSTANCE, nil);
             } else {
-                int size = toInt(object);
+                int size = toIntNode.execute(object);
                 return executeInitialize(array, size, NotProvided.INSTANCE, nil);
             }
         }
@@ -1288,14 +1290,6 @@ protected Object callToAry(Object object) {
             return toAryNode.call(object, "to_ary");
         }
 
-        protected int toInt(Object value) {
-            if (toIntNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                toIntNode = insert(ToIntNode.create());
-            }
-            return toIntNode.execute(value);
-        }
-
     }
 
     @CoreMethod(names = "initialize_copy", required = 1, raiseIfFrozenSelf = true)
diff --git a/src/main/java/org/truffleruby/core/cast/ToIntNode.java b/src/main/java/org/truffleruby/core/cast/ToIntNode.java
@@ -12,15 +12,13 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.NeverDefault;
-import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import org.truffleruby.core.CoreLibrary;
 import org.truffleruby.core.numeric.IntegerNodes.IntegerLowerNode;
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.language.Nil;
-import org.truffleruby.language.RubyBaseNodeWithExecute;
+import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.utils.Utils;
@@ -48,22 +46,10 @@
  * </ul>
  */
 @GenerateUncached
-@NodeChild(value = "childNode", type = RubyBaseNodeWithExecute.class)
-public abstract class ToIntNode extends RubyBaseNodeWithExecute {
-
-    @NeverDefault
-    public static ToIntNode create() {
-        return ToIntNodeGen.create(null);
-    }
-
-    public static ToIntNode create(RubyBaseNodeWithExecute child) {
-        return ToIntNodeGen.create(child);
-    }
+public abstract class ToIntNode extends RubyBaseNode {
 
     public abstract int execute(Object object);
 
-    abstract RubyBaseNodeWithExecute getChildNode();
-
     @Specialization
     protected int coerceInt(int value) {
         return value;
@@ -104,7 +90,7 @@ protected int coerceDouble(double value,
     }
 
     @Specialization
-    protected long coerceNil(Nil value) {
+    protected int coerceNil(Nil value) {
         // MRI hardcodes this specific error message, which is slightly different from the one we would get in the
         // catch-all case.
         throw new RaiseException(
@@ -120,10 +106,4 @@ protected int coerceObject(Object object,
                 .call(coreLibrary().truffleTypeModule, "rb_to_int_fallback", object);
         return fitNode.execute(coerced);
     }
-
-    @Override
-    public RubyBaseNodeWithExecute cloneUninitialized() {
-        return create(getChildNode().cloneUninitialized());
-    }
-
 }
diff --git a/src/main/java/org/truffleruby/core/format/format/FormatCharacterNode.java b/src/main/java/org/truffleruby/core/format/format/FormatCharacterNode.java
@@ -15,7 +15,6 @@
 import com.oracle.truffle.api.strings.TruffleString.FromCodePointNode;
 import com.oracle.truffle.api.strings.TruffleString.ForceEncodingNode;
 import org.truffleruby.core.cast.ToIntNode;
-import org.truffleruby.core.cast.ToIntNodeGen;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.format.FormatNode;
 import org.truffleruby.core.format.convert.ToStrNode;
@@ -37,7 +36,6 @@ public abstract class FormatCharacterNode extends FormatNode {
 
     private final RubyEncoding encoding;
 
-    @Child private ToIntNode toIntegerNode;
     @Child private ToStrNode toStrNode;
     @Child private FromCodePointNode fromCodePointNode;
     @Child private CodePointLengthNode codePointLengthNode;
@@ -49,13 +47,14 @@ public FormatCharacterNode(RubyEncoding encoding) {
 
     @Specialization
     protected RubyString format(Object value,
+            @Cached ToIntNode toIntNode,
             @Cached RubyStringLibrary strings) {
-        final TruffleString character = getCharacter(value, strings);
+        final TruffleString character = getCharacter(value, strings, toIntNode);
         return createString(character, encoding);
     }
 
     @TruffleBoundary
-    protected TruffleString getCharacter(Object value, RubyStringLibrary strings) {
+    protected TruffleString getCharacter(Object value, RubyStringLibrary strings, ToIntNode toIntNode) {
         final TruffleString character;
 
         Object stringArgument;
@@ -66,7 +65,7 @@ protected TruffleString getCharacter(Object value, RubyStringLibrary strings) {
         }
 
         if (stringArgument == null || RubyGuards.isNil(stringArgument)) {
-            final int codepointArgument = toIntegerNode().execute(value);
+            final int codepointArgument = toIntNode.execute(value);
             character = fromCodePointNode().execute(codepointArgument, encoding.tencoding);
 
             if (character == null) {
@@ -102,15 +101,6 @@ private ToStrNode toStrNode() {
         return toStrNode;
     }
 
-    private ToIntNode toIntegerNode() {
-        if (toIntegerNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            toIntegerNode = insert(ToIntNodeGen.create(null));
-        }
-
-        return toIntegerNode;
-    }
-
     private FromCodePointNode fromCodePointNode() {
         if (fromCodePointNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/src/main/java/org/truffleruby/core/support/TypeNodes.java b/src/main/java/org/truffleruby/core/support/TypeNodes.java
@@ -424,10 +424,10 @@ protected long numToLong(Object value) {
 
     @Primitive(name = "rb_num2int")
     public abstract static class RbNum2IntPrimitiveNode extends PrimitiveArrayArgumentsNode {
-        @Child private ToIntNode toIntNode = ToIntNode.create();
 
         @Specialization
-        protected int numToInt(Object value) {
+        protected int numToInt(Object value,
+                @Cached ToIntNode toIntNode) {
             return toIntNode.execute(value);
         }
     }
diff --git a/src/main/java/org/truffleruby/stdlib/readline/ReadlineHistoryNodes.java b/src/main/java/org/truffleruby/stdlib/readline/ReadlineHistoryNodes.java
@@ -58,7 +58,6 @@
 import org.truffleruby.language.control.RaiseException;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.CreateCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.language.yield.CallBlockNode;
@@ -220,15 +219,12 @@ protected Object getIndex(int index) {
     @NodeChild(value = "line", type = RubyNode.class)
     public abstract static class SetIndexNode extends CoreMethodNode {
 
-        @CreateCast("index")
-        protected ToIntNode coerceIndexToInt(RubyBaseNodeWithExecute index) {
-            return ToIntNode.create(index);
-        }
-
         @TruffleBoundary
         @Specialization
-        protected Object setIndex(int index, Object line,
+        protected Object setIndex(Object indexObject, Object line,
+                @Cached ToIntNode toIntNode,
                 @Cached ToJavaStringNode toJavaStringNode) {
+            final int index = toIntNode.execute(indexObject);
             final var lineAsString = toJavaStringNode.execute(this, line);
             final ConsoleHolder consoleHolder = getContext().getConsoleHolder();
 

Original file line number	Diff line number	Diff line change
`@@ -424,10 +424,10 @@ protected long numToLong(Object value) {`
`424`	`424`
`425`	`425`	`@Primitive(name = "rb_num2int")`
`426`	`426`	`public abstract static class RbNum2IntPrimitiveNode extends PrimitiveArrayArgumentsNode {`
`427`		`- @Child private ToIntNode toIntNode = ToIntNode.create();`
`428`	`427`
`429`	`428`	`@Specialization`
`430`		`- protected int numToInt(Object value) {`
	`429`	`+ protected int numToInt(Object value,`
	`430`	`+ @Cached ToIntNode toIntNode) {`
`431`	`431`	`return toIntNode.execute(value);`
`432`	`432`	`}`
`433`	`433`	`}`