Don't check cell assumptions if not constant

Author: timfel

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

@@ -48,6 +48,7 @@
 
 import java.util.List;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -61,6 +62,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -169,8 +171,13 @@ public Object set(PCell self, Object ref) {
     public abstract static class GetRefNode extends Node {
         public abstract Object execute(PCell self);
 
-        @Specialization(guards = "self == cachedSelf", assumptions = "cachedSelf.isEffectivelyFinalAssumption()", limit = "1")
+        protected static Assumption singleContextAssumption() {
+            return PythonLanguage.getCurrent().singleContextAssumption;
+        }
+
+        @Specialization(guards = "self == cachedSelf", assumptions = {"cachedSelf.isEffectivelyFinalAssumption()", "singleContextAssumption"}, limit = "1")
         Object cached(@SuppressWarnings("unused") PCell self,
+                        @SuppressWarnings("unused") @Cached("singleContextAssumption()") Assumption singleContextAssumption,
                         @SuppressWarnings("unused") @Cached("self") PCell cachedSelf,
                         @Cached("self.getRef()") Object ref) {
             return ref;

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

@@ -47,6 +47,7 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
@@ -63,15 +64,22 @@ public Object getRef() {
         return ref;
     }
 
+    public void clearRef(Assumption assumption) {
+        setRef(null, assumption);
+    }
+
     public void clearRef() {
         setRef(null);
     }
 
+    @TruffleBoundary
+    private static void invalidateAssumption(Assumption assumption) {
+        assumption.invalidate();
+    }
+
     public void setRef(Object ref) {
-        if (effectivelyFinal.isValid()) {
-            if (this.ref != null) {
-                effectivelyFinal.invalidate();
-            }
+        if (this.ref != null) {
+            invalidateAssumption(effectivelyFinal);
         }
         this.ref = ref;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteLocalCellNode.java

@@ -27,14 +27,18 @@
 
 import static com.oracle.graal.python.builtins.objects.PNone.NO_VALUE;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.WriteIdentifierNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -83,21 +87,32 @@ public Object getIdentifier() {
         return frameSlot.getIdentifier();
     }
 
+    @ImportStatic(PythonOptions.class)
+    @ReportPolymorphism
     abstract static class WriteToCellNode extends Node {
 
         public abstract void execute(PCell cell, Object value);
 
-        @Specialization(guards = "cell == cachedCell", limit = "1")
+        protected static Assumption singleContextAssumption() {
+            return PythonLanguage.getCurrent().singleContextAssumption;
+        }
+
+        @Specialization(guards = "cell == cachedCell", limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "singleContextAssumption")
         void doWriteCached(@SuppressWarnings("unused") PCell cell, Object value,
+                        @SuppressWarnings("unused") @Cached("singleContextAssumption()") Assumption singleContextAssumption,
                         @Cached("cell") PCell cachedCell) {
-            doWriteGeneric(cachedCell, value);
+            if (value == NO_VALUE) {
+                cachedCell.clearRef(cachedCell.isEffectivelyFinalAssumption());
+            } else {
+                cachedCell.setRef(value, cachedCell.isEffectivelyFinalAssumption());
+            }
         }
 
-        @Specialization(guards = "cell.isEffectivelyFinalAssumption() == effectivelyFinalAssumption", limit = "1", assumptions = "effectivelyFinalAssumption")
+        @Specialization(guards = "cell.isEffectivelyFinalAssumption() == effectivelyFinalAssumption", limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "effectivelyFinalAssumption")
         void doWriteCachedAssumption(PCell cell, Object value,
                         @SuppressWarnings("unused") @Cached("cell.isEffectivelyFinalAssumption()") Assumption effectivelyFinalAssumption) {
             if (value == NO_VALUE) {
-                cell.clearRef();
+                cell.clearRef(effectivelyFinalAssumption);
             } else {
                 cell.setRef(value, effectivelyFinalAssumption);
             }