Delay getting bytecode location for generator state

Author: msimacek

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

@@ -116,21 +116,20 @@ public Object handleResult(PythonLanguage language, GeneratorYieldResult result)
     public static class BytecodeDSLState {
         private final PBytecodeDSLRootNode rootNode;
         private final Object[] arguments;
-        private BytecodeNode bytecodeNode;
+        private BytecodeLocation lastLocation;
         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(PGenerator generator, ContinuationResult result) {
             assert result.getContinuationRootNode() == null || result.getContinuationRootNode().getFrameDescriptor() == generator.frame.getFrameDescriptor();
             isStarted = true;
-            bytecodeNode = continuationRootNode.getLocation().getBytecodeNode();
+            lastLocation = continuationRootNode.getLocation();
             continuationRootNode = result.getContinuationRootNode();
             return result.getResult();
         }
@@ -296,7 +295,12 @@ public RootCallTarget getCurrentCallTarget() {
      */
     public BytecodeNode getBytecodeNode() {
         assert PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER;
-        return getBytecodeDSLState().bytecodeNode;
+        BytecodeDSLState state = getBytecodeDSLState();
+        if (state.lastLocation != null) {
+            return state.lastLocation.getBytecodeNode();
+        } else {
+            return state.rootNode.getBytecodeNode();
+        }
     }
 
     public BytecodeLocation getCurrentLocation() {