[GR-71256] Fix exception location assertion during async Python actions.

PullRequest: graalpython/4098

Author: steve-s

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

@@ -152,7 +152,8 @@ public final PFrame executeOnStack(boolean markAsEscaped, boolean forceSync, Fra
      */
     public final PFrame execute(Node location, boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize) {
         assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER || frameToMaterialize.getArguments().length != 2 : "caller forgot to unwrap continuation frame";
-        assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER || !(location instanceof PBytecodeDSLRootNode) : location.getClass().getSimpleName();
+        assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER || !(location instanceof PBytecodeDSLRootNode) : String.format("Materialized frame: location must not be PBytecodeDSLRootNode, was: %s",
+                        location);
         return executeImpl(location, markAsEscaped, forceSync, frameToMaterialize);
     }
 
@@ -228,7 +229,7 @@ private static void processBytecodeFrame(Frame frameToMaterialize, PFrame pyFram
                 pyFrame.setBci(bytecodeNode.getBytecodeIndex(frameToMaterialize));
                 pyFrame.setLocation(bytecodeNode);
             } else {
-                assert false : String.format("%s, root: %s", location, location != null ? location.getRootNode() : "null");
+                assert location == PythonLanguage.get(null).unavailableSafepointLocation : String.format("%s, root: %s", location, location != null ? location.getRootNode() : "null");
                 pyFrame.setBci(-1);
                 pyFrame.setLocation(location);
             }

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

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.nodes.PRootNode;
+import com.oracle.graal.python.nodes.bytecode_dsl.PBytecodeDSLRootNode;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
@@ -164,19 +165,30 @@ public final void execute(PythonContext context, Access access) {
                     Node prev = null;
                     Node location = access.getLocation();
                     boolean locationAdoptable = location.isAdoptable();
+                    EncapsulatingNodeReference encapsulatingNodeRef = EncapsulatingNodeReference.getCurrent();
                     if (locationAdoptable) {
                         // If the location is not adoptable, then we are in
-                        // IndirectCallContext and SimpleIndirectInvokeNode will do
+                        // IndirectCallContext and SimpleIndirectInvokeNode below will do
                         // IndirectCalleeContext.enter and transfer the state from thread state to
-                        // the frame. If we were woken-up in middle of Python frame code, we will
-                        // have to do a stack walk, but we still need the location
-                        prev = EncapsulatingNodeReference.getCurrent().set(location);
+                        // 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) {
+                            // 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
+                            // dummy node to pass our assertions during stack walking that "call
+                            // node" is never PBytecodeDSLRootNode
+                            prev = encapsulatingNodeRef.set(language.unavailableSafepointLocation);
+                        } else {
+                            prev = encapsulatingNodeRef.set(location);
+                        }
                     }
                     try {
                         CallDispatchers.SimpleIndirectInvokeNode.executeUncached(context.getAsyncHandler().callTarget, args);
                     } catch (PException e) {
                         if (locationAdoptable) {
-                            EncapsulatingNodeReference.getCurrent().set(prev);
+                            encapsulatingNodeRef.set(prev);
                         }
                         handleException(e);
                     } finally {