TryNode converted to DSL node

Author: horakivo

src/main/java/org/truffleruby/core/exception/ExceptionOperations.java

@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
@@ -86,18 +85,6 @@ public static Object getExceptionObject(AbstractTruffleException exception) {
         }
     }
 
-    // TODO remove when TryNode is refactored
-    public static Object getExceptionObject(AbstractTruffleException exception,
-            ConditionProfile raiseExceptionProfile) {
-        assert !(exception instanceof KillException)
-                : "KillException should not be used as an exception object: " + exception;
-        if (raiseExceptionProfile.profile(exception instanceof RaiseException)) {
-            return ((RaiseException) exception).getException();
-        } else {
-            return exception;
-        }
-    }
-
     public static Object getExceptionObject(Node node, AbstractTruffleException exception,
             InlinedConditionProfile raiseExceptionProfile) {
         assert !(exception instanceof KillException)

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

@@ -9,11 +9,14 @@
  */
 package org.truffleruby.language.exceptions;
 
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.TruffleSafepoint;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.core.exception.ExceptionOperations;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -26,24 +29,17 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
-import com.oracle.truffle.api.profiles.BranchProfile;
 import org.truffleruby.language.methods.TranslateExceptionNode;
 import org.truffleruby.language.threadlocal.ThreadLocalGlobals;
 
-public class TryNode extends RubyContextSourceNode {
+public abstract class TryNode extends RubyContextSourceNode {
 
     @Child private RubyNode tryPart;
     @Children private final RescueNode[] rescueParts;
     @Child private RubyNode elsePart;
     @Child private TranslateExceptionNode translateExceptionNode;
     private final boolean canOmitBacktrace;
 
-    private final BranchProfile noExceptionProfile = BranchProfile.create();
-    private final BranchProfile killExceptionProfile = BranchProfile.create();
-    private final BranchProfile guestExceptionProfile = BranchProfile.create();
-    private final BranchProfile retryProfile = BranchProfile.create();
-    private final ConditionProfile raiseExceptionProfile = ConditionProfile.create();
-
     public TryNode(
             RubyNode tryPart,
             RescueNode[] rescueParts,
@@ -56,23 +52,28 @@ public TryNode(
     }
 
     /** Based on {@link InteropLibrary#throwException(Object)}'s {@code TryCatchNode} */
-    @Override
-    public Object execute(VirtualFrame frame) {
+    @Specialization
+    protected Object doTry(VirtualFrame frame,
+            @Cached InlinedBranchProfile noExceptionProfile,
+            @Cached InlinedBranchProfile killExceptionProfile,
+            @Cached InlinedBranchProfile guestExceptionProfile,
+            @Cached InlinedBranchProfile retryProfile,
+            @Cached InlinedConditionProfile raiseExceptionProfile) {
         while (true) {
             Object result;
 
             try {
                 result = tryPart.execute(frame);
-                noExceptionProfile.enter();
+                noExceptionProfile.enter(this);
             } catch (KillException e) { // an AbstractTruffleException but must not set $! and cannot be rescue'd
-                killExceptionProfile.enter();
+                killExceptionProfile.enter(this);
                 throw e;
             } catch (AbstractTruffleException exception) {
-                guestExceptionProfile.enter();
+                guestExceptionProfile.enter(this);
                 try {
-                    return handleException(frame, exception);
+                    return handleException(frame, exception, raiseExceptionProfile);
                 } catch (RetryException e) {
-                    retryProfile.enter();
+                    retryProfile.enter(this);
                     TruffleSafepoint.poll(this);
                     continue;
                 }
@@ -93,8 +94,9 @@ public Object execute(VirtualFrame frame) {
     }
 
     @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
-    private Object handleException(VirtualFrame frame, AbstractTruffleException exception) {
-        final Object exceptionObject = ExceptionOperations.getExceptionObject(exception, raiseExceptionProfile);
+    private Object handleException(VirtualFrame frame, AbstractTruffleException exception,
+            InlinedConditionProfile raiseExceptionProfile) {
+        final Object exceptionObject = ExceptionOperations.getExceptionObject(this, exception, raiseExceptionProfile);
 
         for (RescueNode rescue : rescueParts) {
             if (rescue.canHandle(frame, exceptionObject)) {
@@ -142,7 +144,7 @@ private void printBacktraceOnRescue(RescueNode rescue, AbstractTruffleException
 
     @Override
     public RubyNode cloneUninitialized() {
-        var copy = new TryNode(
+        var copy = TryNodeGen.create(
                 tryPart.cloneUninitialized(),
                 cloneUninitialized(rescueParts),
                 cloneUninitialized(elsePart),

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

@@ -99,7 +99,7 @@
 import org.truffleruby.language.exceptions.RescueClassesNode;
 import org.truffleruby.language.exceptions.RescueNode;
 import org.truffleruby.language.exceptions.RescueSplatNode;
-import org.truffleruby.language.exceptions.TryNode;
+import org.truffleruby.language.exceptions.TryNodeGen;
 import org.truffleruby.language.globals.AliasGlobalVarNode;
 import org.truffleruby.language.globals.ReadGlobalVariableNodeGen;
 import org.truffleruby.language.globals.ReadMatchReferenceNodes;
@@ -2669,7 +2669,7 @@ public RubyNode visitRescueNode(RescueParseNode node) {
             elsePart = node.getElseNode().accept(this);
         }
 
-        final RubyNode ret = new TryNode(
+        final RubyNode ret = TryNodeGen.create(
                 tryPart,
                 rescueNodes.toArray(EMPTY_RESCUE_NODE_ARRAY),
                 elsePart,