Fixing problem, when is deserialized generator.

Author: ppisl

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

@@ -38,6 +38,7 @@
 import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
 import com.oracle.graal.python.parser.DefinitionCellSlots;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -99,12 +100,18 @@ public PGeneratorFunction execute(VirtualFrame frame) {
                         kwDefaultValues));
     }
 
+    public GeneratorFunctionRootNode getGeneratorFunctionRootNode(PythonContext ctx) {
+        if (generatorCallTarget == null) {
+            return new GeneratorFunctionRootNode(ctx.getLanguage(), callTarget, functionName, frameDescriptor,
+                            executionCellSlots, ((PRootNode) callTarget.getRootNode()).getSignature(), numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode, numOfGeneratorTryNode);
+        }
+        return (GeneratorFunctionRootNode) generatorCallTarget.getRootNode();
+    }
+
     protected PCode getGeneratorCode() {
         if (generatorCallTarget == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            GeneratorFunctionRootNode generatorFunctionRootNode = new GeneratorFunctionRootNode(getContext().getLanguage(), callTarget, functionName, frameDescriptor,
-                            executionCellSlots, ((PRootNode) callTarget.getRootNode()).getSignature(), numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode, numOfGeneratorTryNode);
-            generatorCallTarget = Truffle.getRuntime().createCallTarget(generatorFunctionRootNode);
+            generatorCallTarget = Truffle.getRuntime().createCallTarget(getGeneratorFunctionRootNode(getContext()));
         }
         PythonLanguage lang = lookupLanguageReference(PythonLanguage.class).get();
         CompilerAsserts.partialEvaluationConstant(lang);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java

@@ -31,7 +31,7 @@
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.nodes.ModuleRootNode;
 import com.oracle.graal.python.nodes.function.FunctionDefinitionNode;
-import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
+import com.oracle.graal.python.nodes.function.GeneratorFunctionDefinitionNode;
 import com.oracle.graal.python.nodes.util.BadOPCodeNode;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -188,11 +188,11 @@ public RootNode deserialize(Source source, byte[] data, String[] cellvars, Strin
                 // find function RootNode
                 final Node[] fromVisitor = new Node[1];
                 result.accept((Node node) -> {
-                    if (node instanceof FunctionDefinitionNode) {
-                        fromVisitor[0] = ((FunctionDefinitionNode) node).getFunctionRoot();
+                    if (node instanceof GeneratorFunctionDefinitionNode) {
+                        fromVisitor[0] = ((GeneratorFunctionDefinitionNode) node).getGeneratorFunctionRootNode(PythonLanguage.getContext());
                         return false;
-                    } else if (node instanceof GeneratorFunctionRootNode) {
-                        fromVisitor[0] = ((GeneratorFunctionRootNode) node).getFunctionRootNode();
+                    } else if (node instanceof FunctionDefinitionNode) {
+                        fromVisitor[0] = ((FunctionDefinitionNode) node).getFunctionRoot();
                         return false;
                     }
                     return true;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonSSTNodeFactory.java

@@ -62,6 +62,7 @@
 import com.oracle.graal.python.parser.sst.FactorySSTVisitor;
 import com.oracle.graal.python.parser.sst.ForComprehensionSSTNode;
 import com.oracle.graal.python.parser.sst.ForSSTNode;
+import com.oracle.graal.python.parser.sst.FunctionDefSSTNode;
 import com.oracle.graal.python.parser.sst.GeneratorFactorySSTVisitor;
 import com.oracle.graal.python.parser.sst.ImportFromSSTNode;
 import com.oracle.graal.python.parser.sst.ImportSSTNode;
@@ -253,6 +254,13 @@ public Node createParserResult(SSTNode parserSSTResult, PythonParser.ParserMode
             isGen = true;
             scopeEnvironment.setCurrentScope(new ScopeInfo("evalgen", ScopeKind.Generator, useFrame.getFrameDescriptor(), scopeEnvironment.getGlobalScope()));
         } else {
+            if (mode == PythonParser.ParserMode.Deserialization && parserSSTResult instanceof FunctionDefSSTNode) {
+                // we need to chek, if the deserialized function is not generator
+                FunctionDefSSTNode fDef = (FunctionDefSSTNode) parserSSTResult;
+                if (fDef.getScope().getScopeKind() == ScopeKind.Generator) {
+                    isGen = true;
+                }
+            }
             scopeEnvironment.setCurrentScope(scopeEnvironment.getGlobalScope());
         }
         scopeEnvironment.setFreeVarsInRootScope(useFrame);