Avoid NPE when reading frame in async handler when triggered in generator functions

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java

@@ -1002,6 +1002,11 @@ public boolean isInternal() {
             return true;
         }
 
+        @Override
+        public boolean setsUpCalleeContext() {
+            return true;
+        }
+
         protected final Object readSelf(VirtualFrame frame) {
             if (readSelfNode != null) {
                 return readSelfNode.execute(frame);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java

@@ -552,6 +552,11 @@ public boolean isInternal() {
         public boolean isPythonInternal() {
             return true;
         }
+
+        @Override
+        public boolean setsUpCalleeContext() {
+            return true;
+        }
     }
 
     static final class HPyMethNoargsRoot extends HPyMethodDescriptorRootNode {
@@ -1314,6 +1319,11 @@ public boolean isPythonInternal() {
         public boolean isInternal() {
             return true;
         }
+
+        @Override
+        public boolean setsUpCalleeContext() {
+            return true;
+        }
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SortNodes.java

@@ -162,6 +162,11 @@ public boolean isInternal() {
         public String getName() {
             return "sort_comparator";
         }
+
+        @Override
+        public boolean setsUpCalleeContext() {
+            return true;
+        }
     }
 
     public abstract static class SortSequenceStorageNode extends PNodeWithContext {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRootNode.java

@@ -189,4 +189,11 @@ protected byte[] extractCode() {
         // no code for non-user functions
         return PythonUtils.EMPTY_BYTE_ARRAY;
     }
+
+    /**
+     * True if the root calls CalleeContext.enter or an equivalent on entry.
+     */
+    public boolean setsUpCalleeContext() {
+        return false;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeGeneratorFunctionRootNode.java

@@ -109,7 +109,7 @@ public String getName() {
     @Override
     public String toString() {
         CompilerAsserts.neverPartOfCompilation();
-        return "<generator function root" + originalName + ">";
+        return "<generator function root " + originalName + ">";
     }
 
     @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeGeneratorRootNode.java

@@ -195,6 +195,11 @@ public String toString() {
         return "<bytecode " + rootNode.getName() + " (generator resume bci=" + resumeBci + ")>";
     }
 
+    @Override
+    public boolean setsUpCalleeContext() {
+        return true;
+    }
+
     @Override
     public Signature getSignature() {
         return rootNode.getSignature();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -5636,6 +5636,11 @@ public boolean isInternal() {
         return internal;
     }
 
+    @Override
+    public boolean setsUpCalleeContext() {
+        return true;
+    }
+
     @Override
     protected byte[] extractCode() {
         /*

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CallArithmeticRootNode.java

@@ -83,4 +83,9 @@ public Object execute(VirtualFrame frame) {
     }
 
     protected abstract Object doCall(VirtualFrame frame);
+
+    @Override
+    public boolean setsUpCalleeContext() {
+        return true;
+    }
 }

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

@@ -302,8 +302,7 @@ public Frame visitFrame(FrameInstance frameInstance) {
                 RootNode rootNode = target.getRootNode();
                 Node callNode = frameInstance.getCallNode();
                 boolean didMark = IndirectCallNode.setEncapsulatingNeedsToPassCallerFrame(callNode != null ? callNode : requestingNode);
-                if (rootNode instanceof PRootNode && outputFrame[0] == null) {
-                    PRootNode pRootNode = (PRootNode) rootNode;
+                if (outputFrame[0] == null && rootNode instanceof PRootNode pRootNode && pRootNode.setsUpCalleeContext()) {
                     pRootNode.setNeedsCallerFrame();
                     if (i < 0 && startFrame != null) {
                         Frame roFrame = frameInstance.getFrame(FrameInstance.FrameAccess.READ_ONLY);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java

@@ -322,6 +322,11 @@ public boolean isInternal() {
         return true;
     }
 
+    @Override
+    public boolean setsUpCalleeContext() {
+        return true;
+    }
+
     @Override
     public Object execute(VirtualFrame frame) {
         if (body == null) {