cache the closure on the PClosureRootNode in the single context case

Author: timfel

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

@@ -53,7 +53,7 @@ public class PFunction extends PythonObject {
     private final Assumption codeStableAssumption;
     private final Assumption defaultsStableAssumption;
     private final PythonObject globals;
-    private final PCell[] closure;
+    @CompilationFinal(dimensions = 1) private final PCell[] closure;
     private final boolean isStatic;
     @CompilationFinal private PCode code;
     @CompilationFinal(dimensions = 1) private Object[] defaultValues;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureFunctionRootNode.java

@@ -40,11 +40,11 @@
  */
 package com.oracle.graal.python.nodes;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 
@@ -53,7 +53,7 @@ public abstract class PClosureFunctionRootNode extends PClosureRootNode {
     @CompilerDirectives.CompilationFinal(dimensions = 1) protected final Assumption[] cellEffectivelyFinalAssumptions;
     private final Signature signature;
 
-    protected PClosureFunctionRootNode(TruffleLanguage<?> language, FrameDescriptor frameDescriptor, ExecutionCellSlots executionCellSlots, Signature signature) {
+    protected PClosureFunctionRootNode(PythonLanguage language, FrameDescriptor frameDescriptor, ExecutionCellSlots executionCellSlots, Signature signature) {
         super(language, frameDescriptor, executionCellSlots.getFreeVarSlots());
         this.cellVarSlots = executionCellSlots.getCellVarSlots();
         this.cellEffectivelyFinalAssumptions = executionCellSlots.getCellVarAssumptions();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureRootNode.java

@@ -40,49 +40,65 @@
  */
 package com.oracle.graal.python.nodes;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
 public abstract class PClosureRootNode extends PRootNode {
+    private static final PCell[] NO_CLOSURE = new PCell[0];
+    private final Assumption singleContextAssumption;
     @CompilerDirectives.CompilationFinal(dimensions = 1) protected final FrameSlot[] freeVarSlots;
+    @CompilerDirectives.CompilationFinal(dimensions = 1) protected PCell[] closure;
     private final int length;
 
-    protected PClosureRootNode(TruffleLanguage<?> language, FrameDescriptor frameDescriptor, FrameSlot[] freeVarSlots) {
+    protected PClosureRootNode(PythonLanguage language, FrameDescriptor frameDescriptor, FrameSlot[] freeVarSlots) {
         super(language, frameDescriptor);
+        this.singleContextAssumption = language.singleContextAssumption;
         this.freeVarSlots = freeVarSlots;
         this.length = freeVarSlots != null ? freeVarSlots.length : 0;
     }
 
     protected void addClosureCellsToLocals(Frame frame) {
-        PCell[] closure = PArguments.getClosure(frame);
-        if (closure != null) {
+        PCell[] frameClosure = PArguments.getClosure(frame);
+        if (frameClosure != null) {
+            if (singleContextAssumption.isValid() && closure == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                closure = frameClosure;
+            } else if ((!singleContextAssumption.isValid() && closure != null && closure != NO_CLOSURE) || closure != frameClosure) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                closure = NO_CLOSURE;
+            }
             assert freeVarSlots != null : "closure root node: the free var slots cannot be null when the closure is not null";
-            assert closure.length == freeVarSlots.length : "closure root node: the closure must have the same length as the free var slots array";
-            if (freeVarSlots.length < 32) {
+            assert frameClosure.length == freeVarSlots.length : "closure root node: the closure must have the same length as the free var slots array";
+            if (closure != null && closure != NO_CLOSURE) {
                 addClosureCellsToLocalsExploded(frame, closure);
             } else {
-                addClosureCellsToLocalsLoop(frame, closure);
+                if (freeVarSlots.length < 32) {
+                    addClosureCellsToLocalsExploded(frame, frameClosure);
+                } else {
+                    addClosureCellsToLocalsLoop(frame, frameClosure);
+                }
             }
         }
     }
 
-    protected void addClosureCellsToLocalsLoop(Frame frame, PCell[] closure) {
+    protected void addClosureCellsToLocalsLoop(Frame frame, PCell[] frameClosure) {
         for (int i = 0; i < length; i++) {
-            frame.setObject(freeVarSlots[i], closure[i]);
+            frame.setObject(freeVarSlots[i], frameClosure[i]);
         }
     }
 
     @ExplodeLoop
-    protected void addClosureCellsToLocalsExploded(Frame frame, PCell[] closure) {
+    protected void addClosureCellsToLocalsExploded(Frame frame, PCell[] frameClosure) {
         for (int i = 0; i < length; i++) {
-            frame.setObject(freeVarSlots[i], closure[i]);
+            frame.setObject(freeVarSlots[i], frameClosure[i]);
         }
     }