Refactor RescueNode so BooleanCastNode can be inlined

Author: horakivo

src/main/java/org/truffleruby/language/exceptions/RescueClassesNode.java

@@ -11,6 +11,7 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.cast.BooleanCastNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -27,10 +28,10 @@ public RescueClassesNode(RubyNode[] handlingClassNodes, RubyNode rescueBody) {
 
     @ExplodeLoop
     @Override
-    public boolean canHandle(VirtualFrame frame, Object exceptionObject) {
+    public boolean canHandle(VirtualFrame frame, Object exceptionObject, BooleanCastNode booleanCastNode) {
         for (RubyNode handlingClassNode : handlingClassNodes) {
             final Object handlingClass = handlingClassNode.execute(frame);
-            if (matches(exceptionObject, handlingClass)) {
+            if (matches(exceptionObject, handlingClass, booleanCastNode)) {
                 return true;
             }
         }

src/main/java/org/truffleruby/language/exceptions/RescueNode.java

@@ -13,7 +13,6 @@
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.cast.BooleanCastNode;
-import org.truffleruby.core.cast.BooleanCastNodeGen;
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -32,7 +31,6 @@ public abstract class RescueNode extends RubyContextSourceNode {
     @Child private RubyNode rescueBody;
 
     @Child private DispatchNode callTripleEqualsNode;
-    @Child private BooleanCastNode booleanCastNode;
     @Child private InteropLibrary interopLibrary;
 
     private final BranchProfile errorProfile = BranchProfile.create();
@@ -46,14 +44,14 @@ protected RescueNode() {
         this.rescueBody = null;
     }
 
-    public abstract boolean canHandle(VirtualFrame frame, Object exceptionObject);
+    public abstract boolean canHandle(VirtualFrame frame, Object exceptionObject, BooleanCastNode booleanCastNode);
 
     @Override
     public Object execute(VirtualFrame frame) {
         return rescueBody.execute(frame);
     }
 
-    protected boolean matches(Object exceptionObject, Object handlingClass) {
+    protected boolean matches(Object exceptionObject, Object handlingClass, BooleanCastNode booleanCastNode) {
         if (!(handlingClass instanceof RubyModule)) {
             if (interopLibrary == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -70,10 +68,6 @@ protected boolean matches(Object exceptionObject, Object handlingClass) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             callTripleEqualsNode = insert(DispatchNode.create());
         }
-        if (booleanCastNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            booleanCastNode = insert(BooleanCastNodeGen.create(null));
-        }
 
         final Object matches = callTripleEqualsNode.call(handlingClass, "===", exceptionObject);
         return booleanCastNode.execute(matches);

src/main/java/org/truffleruby/language/exceptions/RescueSplatNode.java

@@ -15,6 +15,7 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
+import org.truffleruby.core.cast.BooleanCastNode;
 import org.truffleruby.core.cast.SplatCastNode;
 import org.truffleruby.core.cast.SplatCastNodeGen;
 import org.truffleruby.language.RubyNode;
@@ -39,13 +40,13 @@ public RescueSplatNode(RubyLanguage language, RubyNode handlingClassesArray, Rub
     }
 
     @Override
-    public boolean canHandle(VirtualFrame frame, Object exceptionObject) {
+    public boolean canHandle(VirtualFrame frame, Object exceptionObject, BooleanCastNode booleanCastNode) {
         final RubyArray handlingClasses = (RubyArray) splatCastNode.execute(frame);
 
         int i = 0;
         try {
             for (; loopProfile.inject(i < handlingClasses.size); ++i) {
-                if (matches(exceptionObject, stores.read(handlingClasses.getStore(), i))) {
+                if (matches(exceptionObject, stores.read(handlingClasses.getStore(), i), booleanCastNode)) {
                     return true;
                 }
                 TruffleSafepoint.poll(this);

src/main/java/org/truffleruby/language/exceptions/RescueStandardErrorNode.java

@@ -11,6 +11,7 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.cast.BooleanCastNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -22,8 +23,8 @@ public RescueStandardErrorNode(RubyNode rescueBody) {
     }
 
     @Override
-    public boolean canHandle(VirtualFrame frame, Object exceptionObject) {
-        return matches(exceptionObject, coreLibrary().standardErrorClass);
+    public boolean canHandle(VirtualFrame frame, Object exceptionObject, BooleanCastNode booleanCastNode) {
+        return matches(exceptionObject, coreLibrary().standardErrorClass, booleanCastNode);
     }
 
     @Override

src/main/java/org/truffleruby/language/exceptions/TryNode.java

@@ -17,6 +17,7 @@
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
+import org.truffleruby.core.cast.BooleanCastNode;
 import org.truffleruby.core.exception.ExceptionOperations;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -58,6 +59,7 @@ protected Object doTry(VirtualFrame frame,
             @Cached InlinedBranchProfile killExceptionProfile,
             @Cached InlinedBranchProfile guestExceptionProfile,
             @Cached InlinedBranchProfile retryProfile,
+            @Cached BooleanCastNode booleanCastNode,
             @Cached InlinedConditionProfile raiseExceptionProfile) {
         while (true) {
             Object result;
@@ -71,7 +73,7 @@ protected Object doTry(VirtualFrame frame,
             } catch (AbstractTruffleException exception) {
                 guestExceptionProfile.enter(this);
                 try {
-                    return handleException(frame, exception, raiseExceptionProfile);
+                    return handleException(frame, exception, raiseExceptionProfile, booleanCastNode);
                 } catch (RetryException e) {
                     retryProfile.enter(this);
                     TruffleSafepoint.poll(this);
@@ -95,11 +97,11 @@ protected Object doTry(VirtualFrame frame,
 
     @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     private Object handleException(VirtualFrame frame, AbstractTruffleException exception,
-            InlinedConditionProfile raiseExceptionProfile) {
+            InlinedConditionProfile raiseExceptionProfile, BooleanCastNode booleanCastNode) {
         final Object exceptionObject = ExceptionOperations.getExceptionObject(this, exception, raiseExceptionProfile);
 
         for (RescueNode rescue : rescueParts) {
-            if (rescue.canHandle(frame, exceptionObject)) {
+            if (rescue.canHandle(frame, exceptionObject, booleanCastNode)) {
                 if (getContext().getOptions().BACKTRACE_ON_RESCUE) {
                     printBacktraceOnRescue(rescue, exception);
                 }