don't generate GeneratorFunctionRootNode on fast path

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PGeneratorFunction.java

@@ -25,26 +25,17 @@
  */
 package com.oracle.graal.python.builtins.objects.function;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
-import com.oracle.graal.python.parser.ExecutionCellSlots;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 
 public final class PGeneratorFunction extends PFunction {
 
-    public static PGeneratorFunction create(PythonClass clazz, PythonLanguage language, String name, String enclosingClassName, Arity arity, RootCallTarget callTarget,
-                    FrameDescriptor frameDescriptor, PythonObject globals, PCell[] closure, ExecutionCellSlots executionCellSlots,
-                    int numOfActiveFlags, int numOfGeneratorBlockNode, int numOfGeneratorForNode) {
-
-        GeneratorFunctionRootNode generatorFunctionRootNode = new GeneratorFunctionRootNode(language, callTarget, name,
-                        frameDescriptor, closure, executionCellSlots, numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode);
-
-        return new PGeneratorFunction(clazz, name, enclosingClassName, arity, Truffle.getRuntime().createCallTarget(generatorFunctionRootNode), frameDescriptor, globals, closure);
+    public static PGeneratorFunction create(PythonClass clazz, String name, String enclosingClassName, Arity arity, RootCallTarget callTarget,
+                    FrameDescriptor frameDescriptor, PythonObject globals, PCell[] closure) {
+        return new PGeneratorFunction(clazz, name, enclosingClassName, arity, callTarget, frameDescriptor, globals, closure);
     }
 
     public PGeneratorFunction(PythonClass clazz, String name, String enclosingClassName, Arity arity, RootCallTarget callTarget,

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

@@ -32,21 +32,23 @@
 import com.oracle.graal.python.nodes.EmptyNode;
 import com.oracle.graal.python.nodes.control.BlockNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.parser.DefinitionCellSlots;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public class GeneratorFunctionDefinitionNode extends FunctionDefinitionNode {
-
     protected final int numOfActiveFlags;
     protected final int numOfGeneratorBlockNode;
     protected final int numOfGeneratorForNode;
+    @CompilationFinal private RootCallTarget generatorCallTarget;
 
     public GeneratorFunctionDefinitionNode(String name, String enclosingClassName, ExpressionNode doc, PythonCore core, Arity arity, StatementNode defaults, RootCallTarget callTarget,
                     FrameDescriptor frameDescriptor, DefinitionCellSlots definitionCellSlots, ExecutionCellSlots executionCellSlots,
@@ -76,8 +78,18 @@ public PGeneratorFunction execute(VirtualFrame frame) {
         defaults.executeVoid(frame);
 
         PCell[] closure = getClosureFromLocals(frame);
-        return withDocString(frame, factory().createGeneratorFunction(functionName, enclosingClassName, arity, callTarget, frameDescriptor, PArguments.getGlobals(frame), closure, executionCellSlots,
-                        numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode));
+        return withDocString(frame,
+                        factory().createGeneratorFunction(functionName, enclosingClassName, arity, getGeneratorCallTarget(closure), frameDescriptor, PArguments.getGlobals(frame), closure));
+    }
+
+    protected RootCallTarget getGeneratorCallTarget(PCell[] closure) {
+        if (generatorCallTarget == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            GeneratorFunctionRootNode generatorFunctionRootNode = new GeneratorFunctionRootNode(getContext().getLanguage(), callTarget, functionName,
+                            frameDescriptor, closure, executionCellSlots, numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode);
+            generatorCallTarget = Truffle.getRuntime().createCallTarget(generatorFunctionRootNode);
+        }
+        return generatorCallTarget;
     }
 
     /**
@@ -101,8 +113,7 @@ public PGeneratorFunction execute(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 PCell[] closure = getClosureFromLocals(frame);
                 cached = withDocString(frame,
-                                factory().createGeneratorFunction(functionName, enclosingClassName, arity, callTarget, frameDescriptor, PArguments.getGlobals(frame), closure, executionCellSlots,
-                                                numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode));
+                                factory().createGeneratorFunction(functionName, enclosingClassName, arity, getGeneratorCallTarget(closure), frameDescriptor, PArguments.getGlobals(frame), closure));
             }
             return cached;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -485,10 +485,9 @@ public PGenerator createGenerator(String name, RootCallTarget callTarget,
     }
 
     public PGeneratorFunction createGeneratorFunction(String name, String enclosingClassName, Arity arity, RootCallTarget callTarget,
-                    FrameDescriptor frameDescriptor, PythonObject globals, PCell[] closure, ExecutionCellSlots cellSlots,
-                    int numOfActiveFlags, int numOfGeneratorBlockNode, int numOfGeneratorForNode) {
-        return trace(PGeneratorFunction.create(lookupClass(PythonBuiltinClassType.PGeneratorFunction), getCore().getLanguage(), name, enclosingClassName, arity, callTarget,
-                        frameDescriptor, globals, closure, cellSlots, numOfActiveFlags, numOfGeneratorBlockNode, numOfGeneratorForNode));
+                    FrameDescriptor frameDescriptor, PythonObject globals, PCell[] closure) {
+        return trace(PGeneratorFunction.create(lookupClass(PythonBuiltinClassType.PGeneratorFunction), name, enclosingClassName, arity, callTarget,
+                        frameDescriptor, globals, closure));
     }
 
     public PMappingproxy createMappingproxy(PythonObject object) {