GR-10739: fix missing closure initialization from generator locals

Author: cosminbasca

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

@@ -26,6 +26,7 @@
 package com.oracle.graal.python.nodes.function;
 
 import com.oracle.graal.python.builtins.objects.cell.PCell;
+import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.parser.DefinitionCellSlots;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
@@ -61,4 +62,15 @@ PCell[] getClosureFromLocals(Frame frame) {
 
         return closure;
     }
+
+    PCell[] getClosureFromGeneratorOrFunctionLocals(Frame frame) {
+        PCell[] closure;
+        Frame generatorFrame = PArguments.getGeneratorFrame(frame);
+        if (generatorFrame != null) {
+            closure = getClosureFromLocals(generatorFrame);
+        } else {
+            closure = getClosureFromLocals(frame);
+        }
+        return closure;
+    }
 }

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

@@ -64,7 +64,7 @@ public FunctionDefinitionNode(String functionName, String enclosingClassName, Py
     public Object execute(VirtualFrame frame) {
         defaults.executeVoid(frame);
 
-        PCell[] closure = getClosureFromLocals(frame);
+        PCell[] closure = getClosureFromGeneratorOrFunctionLocals(frame);
         return factory().createFunction(functionName, enclosingClassName, arity, callTarget, frameDescriptor, PArguments.getGlobals(frame), closure);
     }
 

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

@@ -33,7 +33,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -130,13 +129,7 @@ public Object execute(VirtualFrame frame) {
         }
         PArguments.setGlobals(arguments, PArguments.getGlobals(frame));
 
-        PCell[] closure;
-        Frame generatorFrame = PArguments.getGeneratorFrame(frame);
-        if (generatorFrame != null) {
-            closure = getClosureFromLocals(generatorFrame);
-        } else {
-            closure = getClosureFromLocals(frame);
-        }
+        PCell[] closure = getClosureFromGeneratorOrFunctionLocals(frame);
         return factory().createGenerator(name, callTarget, frameDescriptor, arguments, closure, executionCellSlots,
                         numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode);
     }