Better assertion message in MaterializeFrameNode, use BytecodeDescriptor, replace beginTryCatchOtherwise(()->{}) with just beingTryCatch

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/PGenerator.java

@@ -44,7 +44,6 @@
 import com.oracle.graal.python.runtime.object.PFactory;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.bytecode.BytecodeLocation;
@@ -238,10 +237,6 @@ public static Frame unwrapDSLGeneratorFrame(TruffleStackTraceElement element) {
         return element.getFrame();
     }
 
-    public static Frame getDSLGeneratorFrame(Object[] continuationCallArguments) {
-        return (Frame) continuationCallArguments[0];
-    }
-
     public static RootNode unwrapContinuationRoot(RootNode rootNode) {
         if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER &&
                         rootNode instanceof ContinuationRootNode continuationRoot) {
@@ -251,20 +246,7 @@ public static RootNode unwrapContinuationRoot(RootNode rootNode) {
     }
 
     public static PBytecodeDSLRootNode unwrapContinuationRoot(ContinuationRootNode continuationRoot) {
-        if (CompilerDirectives.isPartialEvaluationConstant(continuationRoot)) {
-            return (PBytecodeDSLRootNode) continuationRoot.getSourceRootNode();
-        } else {
-            /*
-             * TODO We know that the continuation root node is always the same type, but we can't
-             * cast to it because it's not public. So we end up with a virtual call.
-             */
-            return unwrapContinuationRootBoundary(continuationRoot);
-        }
-    }
-
-    @TruffleBoundary
-    private static PBytecodeDSLRootNode unwrapContinuationRootBoundary(ContinuationRootNode continuationRoot) {
-        return (PBytecodeDSLRootNode) continuationRoot.getSourceRootNode();
+        return PBytecodeDSLRootNode.cast(continuationRoot);
     }
 
     public static boolean isGeneratorFrame(Frame frame) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -5703,12 +5703,12 @@ private void emitTryExceptElse(StmtTy.TryStar node) {
                                                                 b.emitLoadLocal(matchedExceptions);
                                                             b.endSetCurrentException();
 
-                                                            b.beginTryCatchOtherwise(() -> { });
+                                                            b.beginTryCatch();
                                                                 b.beginThrow(); // "try"
                                                                     b.emitLoadException(); // handler_i_ex (exception thrown in this handler)
                                                                 b.endThrow();
 
-                                                                b.beginBlock(); // catch and insert into exception groups group
+                                                                b.beginBlock(); // catch and insert into exception group
                                                                     b.beginStoreLocal(exceptionAcc);
                                                                         b.beginHandleExceptionsInHandler();
                                                                             b.emitLoadException();
@@ -5718,7 +5718,7 @@ private void emitTryExceptElse(StmtTy.TryStar node) {
                                                                         b.endHandleExceptionsInHandler();
                                                                     b.endStoreLocal();
                                                                 b.endBlock();
-                                                            b.endTryCatchOtherwise();
+                                                            b.endTryCatch();
 
                                                             b.beginSetCurrentException();
                                                                 b.emitLoadLocal(exceptionOrig);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -288,6 +288,7 @@
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
@@ -396,6 +397,10 @@ protected PBytecodeDSLRootNode(PythonLanguage language, FrameDescriptor.Builder
         ((BytecodeDSLFrameInfo) getFrameDescriptor().getInfo()).setRootNode(this);
     }
 
+    public static PBytecodeDSLRootNode cast(RootNode root) {
+        return PBytecodeDSLRootNodeGen.BYTECODE.cast(root);
+    }
+
     public final PythonLanguage getLanguage() {
         return getLanguage(PythonLanguage.class);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java

@@ -224,7 +224,9 @@ private static void processBytecodeFrame(Frame frameToMaterialize, PFrame pyFram
                 pyFrame.setBci(bytecodeNode.getBytecodeIndex(frameToMaterialize));
                 pyFrame.setLocation(bytecodeNode);
             } else {
-                assert location == PythonLanguage.get(null).unavailableSafepointLocation : String.format("%s, root: %s", location, location != null ? location.getRootNode() : "null");
+                assert location == PythonLanguage.get(null).unavailableSafepointLocation : String.format("(%s) %s, root: %s",
+                                location != null ? location.getClass().getSimpleName() : "null",
+                                location, location != null ? location.getRootNode() : "null");
                 pyFrame.setBci(-1);
                 pyFrame.setLocation(location);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadFrameNode.java

@@ -111,8 +111,7 @@ public static class AllPythonFramesSelector implements FrameSelector {
         @Override
         public boolean skip(RootNode rootNode) {
             if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-                // TODO check for specific continuation root
-                return !(rootNode instanceof PBytecodeDSLRootNode || rootNode instanceof ContinuationRootNode);
+                return PBytecodeDSLRootNode.cast(rootNode) == null;
             } else {
                 return !(rootNode instanceof PBytecodeRootNode || rootNode instanceof PBytecodeGeneratorRootNode);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/AsyncHandler.java

@@ -173,7 +173,7 @@ public final void execute(PythonContext context, Access access) {
                         // the frame. Otherwise, we were woken-up in middle of Python frame code, we
                         // will have to do a stack walk if caller frame is needed, but we still need
                         // the "call" location
-                        if (location instanceof PBytecodeDSLRootNode) {
+                        if (location instanceof RootNode root && PBytecodeDSLRootNode.cast(root) != null) {
                             // PBytecodeDSLRootNode is not usable as a location. To resolve the BCI
                             // stored in the frame, we need the currently executing BytecodeNode,
                             // using PBytecodeRootNode.getBytecodeNode() is not correct. We use the