Fix: PGenerator.getBytecodeNode should check running flag not isStarted

Author: steve-s

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

@@ -72,6 +72,7 @@
 import com.oracle.graal.python.nodes.bytecode.FrameInfo;
 import com.oracle.graal.python.nodes.bytecode.GeneratorReturnException;
 import com.oracle.graal.python.nodes.bytecode.GeneratorYieldResult;
+import com.oracle.graal.python.nodes.bytecode_dsl.PBytecodeDSLRootNode;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
 import com.oracle.graal.python.nodes.frame.MaterializeFrameNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -398,7 +399,7 @@ static Object sendThrow(VirtualFrame frame, PGenerator self, Object typ, Object
                 Node location;
                 RootNode rootNode = self.getCurrentCallTarget().getRootNode();
                 if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-                    location = self.getBytecodeNode();
+                    location = ((PBytecodeDSLRootNode) self.getRootNode()).getBytecodeNode();
                 } else {
                     location = rootNode;
                 }

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

@@ -121,6 +121,7 @@ public Object handleResult(PythonLanguage language, GeneratorYieldResult result)
     public static class BytecodeDSLState {
         private final PBytecodeDSLRootNode rootNode;
         private final Object[] arguments;
+        private ContinuationRootNode prevContinuationRootNode;
         private ContinuationRootNode continuationRootNode;
         private boolean isStarted;
 
@@ -133,6 +134,9 @@ public BytecodeDSLState(PBytecodeDSLRootNode rootNode, Object[] arguments, Conti
         public Object handleResult(PGenerator generator, ContinuationResult result) {
             assert result.getContinuationRootNode() == null || result.getContinuationRootNode().getFrameDescriptor() == generator.frame.getFrameDescriptor();
             isStarted = true;
+            // We must keep the previous root so that we can load its BytecodeNode to resolve BCI to
+            // location, the next continuation node may have different BytecodeNode
+            prevContinuationRootNode = continuationRootNode;
             continuationRootNode = result.getContinuationRootNode();
             return result.getResult();
         }
@@ -301,12 +305,11 @@ public RootCallTarget getCurrentCallTarget() {
 
     public BytecodeNode getBytecodeNode() {
         assert PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER;
+        assert !running; // When it is running, we must use stack walking to get the location
         BytecodeDSLState state = getBytecodeDSLState();
         if (state.isStarted) {
-            return state.continuationRootNode.getLocation().getBytecodeNode();
+            return state.prevContinuationRootNode.getLocation().getBytecodeNode();
         } else {
-            // Loading the BytecodeNode from the RootNode field is, in general, not correct, but can
-            // be used if we know that the generator function is currently not on stack.
             return state.rootNode.getBytecodeNode();
         }
     }