Lazily create the DispatchNode for ArrayCastNode and HashCastNode

Author: eregon

src/main/java/org/truffleruby/core/cast/ArrayCastNode.java

@@ -25,7 +25,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_RETURN_MISSING;
 
 /*
  * TODO(CS): could probably unify this with SplatCastNode with some final configuration getContext().getOptions().
@@ -37,8 +36,6 @@ public abstract class ArrayCastNode extends RubyContextSourceNode {
 
     private final SplatCastNode.NilBehavior nilBehavior;
 
-    @Child private DispatchNode toArrayNode = DispatchNode.create(PRIVATE_RETURN_MISSING);
-
     public static ArrayCastNode create() {
         return ArrayCastNodeGen.create(null);
     }
@@ -104,9 +101,10 @@ protected Object cast(Nil nil) {
 
     @Specialization(guards = { "!isRubyBignum(object)", "!isRubyArray(object)" })
     protected Object cast(RubyDynamicObject object,
-            @Cached BranchProfile errorProfile) {
-        final Object result = toArrayNode.call(object, "to_ary");
+            @Cached BranchProfile errorProfile,
+            @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode toArrayNode) {
 
+        final Object result = toArrayNode.call(object, "to_ary");
         if (result == nil) {
             return nil;
         }

src/main/java/org/truffleruby/core/cast/HashCastNode.java

@@ -24,15 +24,12 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_RETURN_MISSING;
 
 // TODO(CS): copy and paste of ArrayCastNode
 
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class HashCastNode extends RubyContextSourceNode {
 
-    @Child private DispatchNode toHashNode = DispatchNode.create(PRIVATE_RETURN_MISSING);
-
     protected abstract RubyNode getChild();
 
     @Specialization
@@ -72,9 +69,10 @@ protected Object castHash(RubyHash hash) {
 
     @Specialization(guards = { "!isRubyBignum(object)", "!isRubyHash(object)" })
     protected Object cast(RubyDynamicObject object,
-            @Cached BranchProfile errorProfile) {
-        final Object result = toHashNode.call(object, "to_hash");
+            @Cached BranchProfile errorProfile,
+            @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode toHashNode) {
 
+        final Object result = toHashNode.call(object, "to_hash");
         if (result == DispatchNode.MISSING) {
             return nil;
         }

src/main/java/org/truffleruby/core/cast/ToAryNode.java

@@ -15,7 +15,6 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -25,8 +24,6 @@
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class ToAryNode extends RubyContextSourceNode {
 
-    @Child private DispatchNode toAryNode;
-
     public static ToAryNode createInternal() {
         return ToAryNodeGen.create(null);
     }
@@ -40,12 +37,8 @@ protected RubyArray coerceRubyArray(RubyArray array) {
 
     @Specialization(guards = "!isRubyArray(object)")
     protected RubyArray coerceObject(Object object,
-            @Cached BranchProfile errorProfile) {
-        if (toAryNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            toAryNode = insert(DispatchNode.create());
-        }
-
+            @Cached BranchProfile errorProfile,
+            @Cached DispatchNode toAryNode) {
         final Object coerced;
         try {
             coerced = toAryNode.call(object, "to_ary");

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

@@ -1615,7 +1615,6 @@ public RubyNode visitHashNode(HashParseNode node) {
         final SourceIndexLength sourceSection = node.getPosition();
 
         final List<RubyNode> hashConcats = new ArrayList<>();
-
         final List<RubyNode> keyValues = new ArrayList<>();
 
         for (ParseNodeTuple pair : node.getPairs()) {