Rename YieldFromGenerator to YieldValue

Author: msimacek

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

@@ -187,8 +187,6 @@ static Object cachedBytecodeDSL(VirtualFrame frame, Node inliningTarget, PGenera
                 MaterializedFrame generatorFrame = self.getGeneratorFrame();
                 Object[] callArguments = new Object[]{generatorFrame, sendValue};
                 Object[] generatorArguments = generatorFrame.getArguments();
-                PArguments.setCallerFrameInfo(generatorArguments, null);
-                PArguments.setException(generatorArguments, null);
                 if (frame == null) {
                     PythonContext context = PythonContext.get(inliningTarget);
                     PythonThreadState threadState = context.getThreadState(context.getLanguage(inliningTarget));
@@ -261,8 +259,6 @@ static Object genericBytecodeDSL(VirtualFrame frame, Node inliningTarget, PGener
                 MaterializedFrame generatorFrame = self.getGeneratorFrame();
                 Object[] callArguments = new Object[]{generatorFrame, sendValue};
                 Object[] generatorArguments = generatorFrame.getArguments();
-                PArguments.setCallerFrameInfo(generatorArguments, null);
-                PArguments.setException(generatorArguments, null);
                 if (frame == null) {
                     PythonContext context = PythonContext.get(inliningTarget);
                     PythonThreadState threadState = context.getThreadState(context.getLanguage(inliningTarget));

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

@@ -208,7 +208,6 @@ static Object getFrame(VirtualFrame frame, PGenerator self,
                     BytecodeDSLFrameInfo info = (BytecodeDSLFrameInfo) generatorFrame.getFrameDescriptor().getInfo();
                     if (pyFrame == null) {
                         pyFrame = MaterializeFrameNode.materializeGeneratorFrame(self.getBytecodeNode(), generatorFrame, self.getGlobals(), currentRef);
-                        currentRef.setPyFrame(pyFrame);
                     }
                     BytecodeLocation location = self.getCurrentLocation();
                     if (location != null) {
@@ -223,7 +222,6 @@ static Object getFrame(VirtualFrame frame, PGenerator self,
                     BytecodeFrameInfo info = (BytecodeFrameInfo) generatorFrame.getFrameDescriptor().getInfo();
                     if (pyFrame == null) {
                         pyFrame = MaterializeFrameNode.materializeGeneratorFrame(info.getRootNode(), generatorFrame, self.getGlobals(), currentRef);
-                        currentRef.setPyFrame(pyFrame);
                     }
                     int bci = self.getBci();
                     if (bci >= 0) {

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

@@ -209,7 +209,9 @@ public Object[] getCallArguments(Object sendValue) {
 
     public void prepareResume() {
         assert PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER; // not needed for manual interpreter
-        PArguments.setException(getBytecodeDSLState().arguments, null);
+        Object[] frame = getGeneratorFrame().getArguments();
+        PArguments.setException(frame, null);
+        PArguments.setCallerFrameInfo(frame, null);
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -1330,9 +1330,9 @@ private void emitYield(Consumer<StatementCompiler> yieldValueProducer, Statement
         }
 
         statementCompiler.b.beginResumeYield(generatorExceptionStateLocal, savedExLocal);
-        statementCompiler.b.beginYieldFromGenerator(generatorExceptionStateLocal);
+        statementCompiler.b.beginYieldValue();
         yieldValueProducer.accept(statementCompiler);
-        statementCompiler.b.endYieldFromGenerator();
+        statementCompiler.b.endYieldValue();
         statementCompiler.b.endResumeYield();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -1115,10 +1115,9 @@ public static void doObject(VirtualFrame frame, Object generator,
      */
     @Yield
     @SuppressWarnings("truffle-interpreted-performance") // blocked by GR-69979
-    @ConstantOperand(type = LocalAccessor.class)
-    public static final class YieldFromGenerator {
+    public static final class YieldValue {
         @Specialization
-        public static Object doObject(LocalAccessor currentGeneratorException, Object value,
+        public static Object doObject(Object value,
                         @Bind ContinuationRootNode continuationRootNode,
                         @Bind MaterializedFrame frame,
                         @Bind PBytecodeDSLRootNode root,

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

@@ -184,7 +184,6 @@ static PFrame freshPFrameForGenerator(Node location, @SuppressWarnings("unused")
         MaterializedFrame generatorFrame = PGenerator.getGeneratorFrame(frameToMaterialize);
         PFrame.Reference frameRef = PArguments.getCurrentFrameInfo(frameToMaterialize);
         PFrame escapedFrame = materializeGeneratorFrame(location, generatorFrame, PArguments.getGlobals(frameToMaterialize), frameRef);
-        frameRef.setPyFrame(escapedFrame);
         return doEscapeFrame(frameToMaterialize, escapedFrame, markAsEscaped, false, location, null);
     }
 
@@ -207,6 +206,7 @@ public static PFrame materializeGeneratorFrame(Node location, MaterializedFrame
         PFrame escapedFrame = PFactory.createPFrame(PythonLanguage.get(location), frameRef, location, false);
         escapedFrame.setLocals(generatorFrame);
         escapedFrame.setGlobals(globals);
+        frameRef.setPyFrame(escapedFrame);
         return escapedFrame;
     }