Convert remaining single context assumptions usages to isSingleContext

steve-s · steve-s · commit d12d0d08dc81 · 2022-01-20T15:20:31.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -219,7 +219,6 @@
 import com.oracle.graal.python.util.CharsetMapping;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -1766,7 +1765,6 @@ public abstract static class PrintNode extends PythonBuiltinNode {
         private static final String DEFAULT_END = "\n";
         private static final String DEFAULT_SEPARATOR = " ";
         @Child private ReadAttributeFromObjectNode readStdout;
-        @CompilationFinal private Assumption singleContextAssumption;
         @CompilationFinal private PythonModule cachedSys;
 
         @Specialization
@@ -1844,12 +1842,8 @@ PNone printGeneric(VirtualFrame frame, Object[] values, Object sepIn, Object end
         }
 
         private Object getStdout() {
-            if (singleContextAssumption == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                singleContextAssumption = singleContextAssumption();
-            }
             PythonModule sys;
-            if (singleContextAssumption.isValid()) {
+            if (getLanguage().isSingleContext()) {
                 if (cachedSys == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     cachedSys = getContext().lookupBuiltinModule("sys");
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java
@@ -96,6 +96,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.TransformExceptionToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.VoidPtrToJavaNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.WriteNativeMemberNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.MethKeywordsRoot;
@@ -106,7 +107,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeReferenceCache.ResolveNativeReferenceNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PGetDynamicTypeNode.GetSulongTypeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectFree.FreeNode;
-import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CByteArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CStringWrapper;
@@ -2643,7 +2643,7 @@ public abstract static class IsPointerNode extends com.oracle.graal.python.nodes
 
         public abstract boolean execute(PythonNativeWrapper obj);
 
-        @Specialization(assumptions = {"singleContextAssumption()", "nativeObjectsAllManagedAssumption()"})
+        @Specialization(guards = "isSingleContext()", assumptions = "nativeObjectsAllManagedAssumption()")
         static boolean doFalse(@SuppressWarnings("unused") PythonNativeWrapper obj) {
             return false;
         }
@@ -2686,9 +2686,9 @@ public abstract static class GetTypeMemberNode extends PNodeWithContext {
          * native context, so we can be sure that the "nativeClassStableAssumption" (which is
          * per-context) is from the context in which this native object was created.
          */
-        @Specialization(guards = {"lib.isIdentical(cachedObj, obj, lib)", "memberName == cachedMemberName"}, //
+        @Specialization(guards = {"isSingleContext()", "lib.isIdentical(cachedObj, obj, lib)", "memberName == cachedMemberName"}, //
                         limit = "1", //
-                        assumptions = {"getNativeClassStableAssumption(cachedObj)", "singleContextAssumption()"})
+                        assumptions = {"getNativeClassStableAssumption(cachedObj)"})
         public Object doCachedObj(@SuppressWarnings("unused") PythonAbstractNativeObject obj, @SuppressWarnings("unused") NativeMember memberName,
                         @Cached("obj") @SuppressWarnings("unused") PythonAbstractNativeObject cachedObj,
                         @CachedLibrary(limit = "2") @SuppressWarnings("unused") InteropLibrary lib,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/InvalidateNativeObjectsAllManagedNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/InvalidateNativeObjectsAllManagedNode.java
@@ -53,7 +53,7 @@ public abstract class InvalidateNativeObjectsAllManagedNode extends PNodeWithCon
 
     public abstract void execute();
 
-    @Specialization(assumptions = {"singleContextAssumption()", "nativeObjectsAllManagedAssumption"})
+    @Specialization(guards = "isSingleContext()", assumptions = "nativeObjectsAllManagedAssumption")
     @TruffleBoundary
     static void doValid(
                     @Cached("nativeObjectsAllManagedAssumption()") Assumption nativeObjectsAllManagedAssumption) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/ReadAttributeFromDynamicObjectNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/ReadAttributeFromDynamicObjectNode.java
@@ -84,14 +84,15 @@ protected static boolean isLongLivedObject(DynamicObject object) {
     @SuppressWarnings("unused")
     @Specialization(limit = "1", //
                     guards = {
+                                    "isSingleContext()",
                                     "dynamicObject == cachedObject",
                                     "isLongLivedObject(cachedObject)",
                                     "key == cachedKey",
                                     "dynamicObject.getShape() == cachedShape",
                                     "loc != null",
                                     "loc.isAssumedFinal()"
                     }, //
-                    assumptions = {"singleContextAssumption()", "cachedShape.getValidAssumption()", "loc.getFinalAssumption()"})
+                    assumptions = {"cachedShape.getValidAssumption()", "loc.getFinalAssumption()"})
     protected Object readFinalAttr(DynamicObject dynamicObject, String key,
                     @Cached("key") String cachedKey,
                     @Cached(value = "dynamicObject", weak = true) DynamicObject cachedObject,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/FunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/FunctionNodes.java
@@ -40,8 +40,8 @@
  */
 package com.oracle.graal.python.nodes.builtins;
 
-import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.code.CodeNodes;
+import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -50,10 +50,10 @@
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.nodes.builtins.FunctionNodesFactory.GetCallTargetNodeGen;
 import com.oracle.graal.python.nodes.builtins.FunctionNodesFactory.GetDefaultsNodeGen;
 import com.oracle.graal.python.nodes.builtins.FunctionNodesFactory.GetKeywordDefaultsNodeGen;
 import com.oracle.graal.python.nodes.builtins.FunctionNodesFactory.GetSignatureNodeGen;
-import com.oracle.graal.python.nodes.builtins.FunctionNodesFactory.GetCallTargetNodeGen;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Bind;
@@ -70,7 +70,7 @@ public abstract static class GetFunctionDefaultsNode extends PNodeWithContext {
 
         public abstract Object[] execute(PFunction function);
 
-        @Specialization(guards = {"self == cachedSelf"}, assumptions = {"singleContextAssumption()", "defaultsStableAssumption"})
+        @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = "defaultsStableAssumption")
         static Object[] getDefaultsCached(@SuppressWarnings("unused") PFunction self,
                         @SuppressWarnings("unused") @Cached("self") PFunction cachedSelf,
                         @Cached(value = "self.getDefaults()", dimensions = 1) Object[] cachedDefaults,
@@ -129,7 +129,7 @@ public abstract static class GetFunctionKeywordDefaultsNode extends PNodeWithCon
 
         public abstract PKeyword[] execute(PFunction function);
 
-        @Specialization(guards = {"self == cachedSelf"}, assumptions = {"singleContextAssumption()", "defaultsStableAssumption"})
+        @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = "defaultsStableAssumption")
         static PKeyword[] getKwDefaultsCached(@SuppressWarnings("unused") PFunction self,
                         @SuppressWarnings("unused") @Cached("self") PFunction cachedSelf,
                         @Cached(value = "self.getKwDefaults()", dimensions = 1) PKeyword[] cachedKeywordDefaults,
@@ -188,7 +188,7 @@ public abstract static class GetFunctionCodeNode extends PNodeWithContext {
 
         public abstract PCode execute(PFunction function);
 
-        @Specialization(guards = {"self == cachedSelf"}, assumptions = {"singleContextAssumption()", "codeStableAssumption"})
+        @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = "codeStableAssumption")
         static PCode getCodeCached(@SuppressWarnings("unused") PFunction self,
                         @SuppressWarnings("unused") @Cached("self") PFunction cachedSelf,
                         @Cached("self.getCode()") PCode cachedCode,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteLocalCellNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteLocalCellNode.java
@@ -86,9 +86,8 @@ abstract static class WriteToCellNode extends PNodeWithContext {
 
         public abstract void execute(PCell cell, Object value);
 
-        @Specialization(guards = "cell == cachedCell", limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "singleContextAssumption")
+        @Specialization(guards = {"isSingleContext()", "cell == cachedCell"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
         void doWriteCached(@SuppressWarnings("unused") PCell cell, Object value,
-                        @SuppressWarnings("unused") @Cached("singleContextAssumption()") Assumption singleContextAssumption,
                         @Cached("cell") PCell cachedCell) {
             if (value == NO_VALUE) {
                 cachedCell.clearRef(cachedCell.isEffectivelyFinalAssumption());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java
@@ -181,6 +181,7 @@ boolean isVariableSubtypeOfConstantTypeCachedMultiContext(Object derived, @Suppr
     }
 
     @Specialization(guards = {
+                    "isSingleContext()",
                     "isTypeDerived.execute(derived)", "isTypeCls.execute(cls)",
                     "isSameType(isSameDerivedNode, derived, cachedDerived)",
                     "isSameType(isSameClsNode, cls, cachedCls)",
@@ -189,7 +190,6 @@ boolean isVariableSubtypeOfConstantTypeCachedMultiContext(Object derived, @Suppr
                     "isVariableSubtypeOfConstantTypeCachedMultiContext",
     }, assumptions = {
                     "mro.getLookupStableAssumption()",
-                    "singleContextAssumption()"
     })
     @SuppressWarnings("unused")
     boolean isSubtypeOfCached(Object derived, Object cls,
@@ -207,6 +207,7 @@ boolean isSubtypeOfCached(Object derived, Object cls,
     }
 
     @Specialization(guards = {
+                    "isSingleContext()",
                     "isTypeDerived.execute(derived)", "isTypeCls.execute(cls)",
                     "isSameType(isSameDerivedNode, derived, cachedDerived)",
                     "mro.getInternalClassArray().length < 32"
@@ -215,8 +216,7 @@ boolean isSubtypeOfCached(Object derived, Object cls,
                     "isVariableSubtypeOfConstantTypeCachedMultiContext",
                     "isSubtypeOfCached"
     }, assumptions = {
-                    "mro.getLookupStableAssumption()",
-                    "singleContextAssumption()"
+                    "mro.getLookupStableAssumption()"
     })
     boolean isSubtypeOfVariableTypeCached(@SuppressWarnings("unused") Object derived, Object cls,
                     @Cached("derived") @SuppressWarnings("unused") Object cachedDerived,
@@ -231,6 +231,7 @@ boolean isSubtypeOfVariableTypeCached(@SuppressWarnings("unused") Object derived
     }
 
     @Specialization(guards = {
+                    "isSingleContext()",
                     "isKindOfBuiltinClass(derived)", // see assertion in isSubMro
                     "isKindOfBuiltinClass(cls)", // see assertion in isSubMro
                     "mroAry.length == derivedMroLen",
@@ -242,8 +243,7 @@ boolean isSubtypeOfVariableTypeCached(@SuppressWarnings("unused") Object derived
                     "isSubtypeOfCached",
                     "isSubtypeOfVariableTypeCached",
     }, assumptions = {
-                    "baseMro.getLookupStableAssumption()",
-                    "singleContextAssumption()"
+                    "baseMro.getLookupStableAssumption()"
     })
     boolean isVariableSubtypeOfConstantTypeCached(Object derived, @SuppressWarnings("unused") Object cls,
                     @Cached("cls") @SuppressWarnings("unused") Object cachedCls,
