Store the correct BytecodeNode for generator frames in DSL

Author: msimacek

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

@@ -189,10 +189,10 @@ static Object getFrame(PGenerator self) {
                 return PNone.NONE;
             } else {
                 if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-                    BytecodeLocation location = self.getCurrentRootNode().getLocation();
                     MaterializedFrame generatorFrame = self.getGeneratorFrame();
                     BytecodeDSLFrameInfo info = (BytecodeDSLFrameInfo) generatorFrame.getFrameDescriptor().getInfo();
-                    PFrame frame = MaterializeFrameNode.materializeGeneratorFrame(location != null ? location.getBytecodeNode() : null, generatorFrame, PFrame.Reference.EMPTY);
+                    PFrame frame = MaterializeFrameNode.materializeGeneratorFrame(self.getBytecodeNode(), generatorFrame, PFrame.Reference.EMPTY);
+                    BytecodeLocation location = self.getCurrentLocation();
                     if (location != null) {
                         int bci = location.getBytecodeIndex();
                         frame.setBci(bci);

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

@@ -47,6 +47,8 @@
 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;
+import com.oracle.truffle.api.bytecode.BytecodeNode;
 import com.oracle.truffle.api.bytecode.ContinuationResult;
 import com.oracle.truffle.api.bytecode.ContinuationRootNode;
 import com.oracle.truffle.api.frame.Frame;
@@ -116,17 +118,20 @@ public Object handleResult(PythonLanguage language, GeneratorYieldResult result)
     private static class BytecodeDSLState {
         private final PBytecodeDSLRootNode rootNode;
         private final Object[] arguments;
+        private BytecodeNode bytecodeNode;
         private ContinuationRootNode continuationRootNode;
         private boolean isStarted;
 
         public BytecodeDSLState(PBytecodeDSLRootNode rootNode, Object[] arguments, ContinuationRootNode continuationRootNode) {
             this.rootNode = rootNode;
             this.arguments = arguments;
             this.continuationRootNode = continuationRootNode;
+            this.bytecodeNode = rootNode.getBytecodeNode();
         }
 
         public Object handleResult(ContinuationResult result) {
             isStarted = true;
+            bytecodeNode = continuationRootNode.getLocation().getBytecodeNode();
             continuationRootNode = result.getContinuationRootNode();
             return result.getResult();
         }
@@ -312,9 +317,17 @@ public RootCallTarget getCurrentCallTarget() {
         }
     }
 
-    public ContinuationRootNode getCurrentRootNode() {
+    /**
+     * Return the BytecodeNode that should be used for accessing the frame
+     */
+    public BytecodeNode getBytecodeNode() {
+        assert PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER;
+        return getBytecodeDSLState().bytecodeNode;
+    }
+
+    public BytecodeLocation getCurrentLocation() {
         assert PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER;
-        return getBytecodeDSLState().continuationRootNode;
+        return getBytecodeDSLState().continuationRootNode.getLocation();
     }
 
     public Object getYieldFrom() {
@@ -327,7 +340,7 @@ public Object getYieldFrom() {
             if (rootNode.yieldFromGeneratorIndex == -1 || !getBytecodeDSLState().isStarted) {
                 return null;
             }
-            return rootNode.getBytecodeNode().getLocalValue(0, getGeneratorFrame(), rootNode.yieldFromGeneratorIndex);
+            return getBytecodeNode().getLocalValue(0, getGeneratorFrame(), rootNode.yieldFromGeneratorIndex);
         } else {
             return frameInfo.getYieldFrom(frame, getBci(), getBytecodeState().getCurrentRootNode().getResumeStackTop());
         }