CellBuiltins, CExtNodes use PythonLanguage#isSingleContext

Author: steve-s

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

@@ -52,7 +52,6 @@
 
 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;
@@ -64,18 +63,17 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PythonBuiltinClassType.PCell)
@@ -298,16 +296,11 @@ Object set(PCell self, Object ref) {
         }
     }
 
-    public abstract static class GetRefNode extends Node {
+    public abstract static class GetRefNode extends PNodeWithContext {
         public abstract Object execute(PCell self);
 
-        protected Assumption singleContextAssumption() {
-            return PythonLanguage.get(this).singleContextAssumption;
-        }
-
-        @Specialization(guards = "self == cachedSelf", assumptions = {"cachedSelf.isEffectivelyFinalAssumption()", "singleContextAssumption"}, limit = "1")
+        @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.isEffectivelyFinalAssumption()"}, 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/cext/capi/CExtNodes.java

@@ -3160,15 +3160,14 @@ static boolean isLazyContext(CApiContext cApiContext) {
     }
 
     @GenerateUncached
-    public abstract static class ResolveHandleNode extends Node {
+    public abstract static class ResolveHandleNode extends PNodeWithContext {
 
         public abstract Object execute(Object pointerObject);
 
         public abstract Object executeLong(long pointer);
 
         @Specialization(limit = "3", //
-                        guards = {"cachedPointer == pointer", "cachedValue != null"}, //
-                        assumptions = "singleContextAssumption()", //
+                        guards = {"isSingleContext()", "cachedPointer == pointer", "cachedValue != null"}, //
                         rewriteOn = InvalidAssumptionException.class)
         static PythonNativeWrapper resolveLongCached(@SuppressWarnings("unused") long pointer,
                         @Cached("pointer") @SuppressWarnings("unused") long cachedPointer,
@@ -3179,8 +3178,7 @@ static PythonNativeWrapper resolveLongCached(@SuppressWarnings("unused") long po
         }
 
         @Specialization(limit = "3", //
-                        guards = {"isSame(lib, cachedPointerObject, pointerObject)", "cachedValue != null"}, //
-                        assumptions = "singleContextAssumption()", //
+                        guards = {"isSingleContext()", "isSame(lib, cachedPointerObject, pointerObject)", "cachedValue != null"}, //
                         rewriteOn = InvalidAssumptionException.class)
         static PythonNativeWrapper resolveObjectCached(@SuppressWarnings("unused") Object pointerObject,
                         @Cached("pointerObject") @SuppressWarnings("unused") Object cachedPointerObject,
@@ -3220,10 +3218,6 @@ static boolean isSame(InteropLibrary lib, Object left, Object right) {
             return lib.isIdentical(left, right, lib);
         }
 
-        Assumption singleContextAssumption() {
-            return PythonLanguage.get(this).singleContextAssumption;
-        }
-
         static Assumption getHandleValidAssumption(PythonNativeWrapper nativeWrapper) {
             return nativeWrapper.ensureHandleValidAssumption();
         }