Share cell assumptions across instances.

(cherry picked from commit 3c2e991)

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cell/PCell.java

@@ -44,12 +44,15 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 
 public final class PCell extends PythonAbstractObject {
-    private Assumption effectivelyFinal;
+    private final Assumption effectivelyFinal;
     private Object ref;
 
+    public PCell(Assumption effectivelyFinalAssumption) {
+        this.effectivelyFinal = effectivelyFinalAssumption;
+    }
+
     public Object getRef() {
         return ref;
     }
@@ -59,7 +62,7 @@ public void clearRef() {
     }
 
     public void setRef(Object ref) {
-        if (effectivelyFinal != null && effectivelyFinal.isValid()) {
+        if (effectivelyFinal.isValid()) {
             if (this.ref != null) {
                 effectivelyFinal.invalidate();
             }
@@ -68,10 +71,6 @@ public void setRef(Object ref) {
     }
 
     public Assumption isEffectivelyFinalAssumption() {
-        CompilerAsserts.neverPartOfCompilation();
-        if (effectivelyFinal == null) {
-            effectivelyFinal = Truffle.getRuntime().createAssumption("cell is effectively final");
-        }
         return effectivelyFinal;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

@@ -115,7 +115,7 @@ public PCode execute(LazyPythonClass cls, int argcount, int kwonlyargcount,
                             Object ident = freevars[i];
                             FrameSlot slot = frameDescriptor.addFrameSlot(ident);
                             frameDescriptor.setFrameSlotKind(slot, FrameSlotKind.Object);
-                            frame.setObject(slot, new PCell());
+                            frame.setObject(slot, new PCell(Truffle.getRuntime().createAssumption("cell is effectively final")));
                         }
                     }
                     rootNode = (RootNode) core.getParser().parse(ParserMode.File, core, Source.newBuilder(PythonLanguage.ID, new String(codestring), name).build(), frame);

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

@@ -31,6 +31,7 @@
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
@@ -61,6 +62,7 @@ public static PGenerator create(LazyPythonClass clazz, String name, RootCallTarg
         // set generator closure to the generator frame locals
         FrameSlot[] freeVarSlots = cellSlots.getFreeVarSlots();
         FrameSlot[] cellVarSlots = cellSlots.getCellVarSlots();
+        Assumption[] cellVarAssumptions = cellSlots.getCellVarAssumptions();
 
         if (closure != null) {
             assert closure.length == freeVarSlots.length : "generator creation: the closure must have the same length as the free var slots array";
@@ -72,8 +74,8 @@ public static PGenerator create(LazyPythonClass clazz, String name, RootCallTarg
         }
         // initialize own cell vars to new cells (these cells will be used by nested functions to
         // create their own closures)
-        for (FrameSlot frameSlot : cellVarSlots) {
-            generatorFrame.setObject(frameSlot, new PCell());
+        for (int i = 0; i < cellVarSlots.length; i++) {
+            generatorFrame.setObject(cellVarSlots[i], new PCell(cellVarAssumptions[i]));
         }
         return new PGenerator(clazz, name, callTarget, frameDescriptor, arguments, closure);
     }

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

@@ -42,18 +42,21 @@
 
 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;
 
 public abstract class PClosureFunctionRootNode extends PClosureRootNode {
     @CompilerDirectives.CompilationFinal(dimensions = 1) protected final FrameSlot[] cellVarSlots;
+    @CompilerDirectives.CompilationFinal(dimensions = 1) protected final Assumption[] cellEffectivelyFinalAssumptions;
     private final Signature signature;
 
     protected PClosureFunctionRootNode(TruffleLanguage<?> language, FrameDescriptor frameDescriptor, ExecutionCellSlots executionCellSlots, Signature signature) {
         super(language, frameDescriptor, executionCellSlots.getFreeVarSlots());
         this.cellVarSlots = executionCellSlots.getCellVarSlots();
+        this.cellEffectivelyFinalAssumptions = executionCellSlots.getCellVarAssumptions();
         this.signature = signature;
     }
 

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

@@ -111,7 +111,7 @@ private void initializeCellVars(Frame frame) {
                 cell = (PCell) FrameUtil.getObjectSafe(frame, frameSlot);
             }
             if (cell == null) {
-                cell = new PCell();
+                cell = new PCell(cellEffectivelyFinalAssumptions[i]);
             }
 
             // store the cell as a local var

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -25,15 +25,22 @@
  */
 package com.oracle.graal.python.parser;
 
+import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameSlot;
 
 public final class ExecutionCellSlots implements CellSlots {
     private final FrameSlot[] cellVarSlots;
     private final FrameSlot[] freeVarSlots;
+    private final Assumption[] cellVarAssumptions;
 
     ExecutionCellSlots(CellFrameSlotSupplier supplier) {
         this.cellVarSlots = supplier.getCellVarSlots();
         this.freeVarSlots = supplier.getFreeVarSlots();
+        this.cellVarAssumptions = new Assumption[cellVarSlots.length];
+        for (int i = 0; i < cellVarAssumptions.length; i++) {
+            cellVarAssumptions[i] = Truffle.getRuntime().createAssumption("cell is effectively final");
+        }
     }
 
     @Override
@@ -45,4 +52,8 @@ public FrameSlot[] getCellVarSlots() {
     public FrameSlot[] getFreeVarSlots() {
         return freeVarSlots;
     }
+
+    public Assumption[] getCellVarAssumptions() {
+        return cellVarAssumptions;
+    }
 }