HandleCache, NativeReferenceCache, ObjectBuiltins, PClosureRootNode use PythonLanguage#isSingleContext

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/HandleCache.java

@@ -40,7 +40,7 @@
  */
 package com.oracle.graal.python.builtins.objects.cext.capi;
 
-import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -59,7 +59,6 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
-import com.oracle.truffle.api.nodes.Node;
 
 @ExportLibrary(InteropLibrary.class)
 public final class HandleCache implements TruffleObject {
@@ -107,12 +106,11 @@ public Object execute(Object[] arguments,
 
     @GenerateUncached
     @ImportStatic(HandleCache.class)
-    abstract static class GetOrInsertNode extends Node {
+    abstract static class GetOrInsertNode extends PNodeWithContext {
         public abstract Object execute(HandleCache cache, long handle) throws UnsupportedTypeException, ArityException, UnsupportedMessageException;
 
         @Specialization(limit = "CACHE_SIZE", //
-                        guards = {"handle == cachedHandle", "cachedValue != null"}, //
-                        assumptions = "singleContextAssumption()", //
+                        guards = {"isSingleContext()", "handle == cachedHandle", "cachedValue != null"}, //
                         rewriteOn = InvalidAssumptionException.class)
         static PythonNativeWrapper doCachedSingleContext(@SuppressWarnings("unused") HandleCache cache, @SuppressWarnings("unused") long handle,
                         @Cached("handle") @SuppressWarnings("unused") long cachedHandle,
@@ -122,7 +120,7 @@ static PythonNativeWrapper doCachedSingleContext(@SuppressWarnings("unused") Han
             return cachedValue;
         }
 
-        @Specialization(replaces = "doCachedSingleContext", assumptions = "singleContextAssumption()")
+        @Specialization(replaces = "doCachedSingleContext", guards = "isSingleContext()")
         static Object doGenericSingleContext(@SuppressWarnings("unused") HandleCache cache, long handle,
                         @Cached(value = "cache.getPtrToResolveHandle()", allowUncached = true) Object resolveHandleFunction,
                         @CachedLibrary("resolveHandleFunction") InteropLibrary interopLibrary) throws UnsupportedTypeException, ArityException, UnsupportedMessageException {
@@ -151,10 +149,6 @@ static Object resolveHandle(long handle, Object ptrToResolveHandle, InteropLibra
             return interopLibrary.execute(ptrToResolveHandle, handle);
         }
 
-        Assumption singleContextAssumption() {
-            return PythonLanguage.get(this).singleContextAssumption;
-        }
-
         static Assumption getHandleValidAssumption(PythonNativeWrapper nativeWrapper) {
             return nativeWrapper.ensureHandleValidAssumption();
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeReferenceCache.java

@@ -46,11 +46,11 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext.NativeObjectReference;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetRefCntNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.GetRefCntNodeGen;
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaLongLossyNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Cached;
@@ -107,7 +107,7 @@ Object execute(Object[] arguments,
 
     @GenerateUncached
     @ImportStatic(CApiGuards.class)
-    public abstract static class ResolveNativeReferenceNode extends Node {
+    public abstract static class ResolveNativeReferenceNode extends PNodeWithContext {
         private static final TruffleLogger LOGGER = PythonLanguage.getLogger(ResolveNativeReferenceNode.class);
 
         private static final Object NO_REF_CNT = new Object();
@@ -127,9 +127,8 @@ protected static PythonContext getContext(Node node) {
             return PythonContext.get(node);
         }
 
-        @Specialization(guards = {"!isResolved(pointerObject)", "ref != null", "isSame(interoplibrary, pointerObject, ref)"}, //
+        @Specialization(guards = {"isSingleContext()", "!isResolved(pointerObject)", "ref != null", "isSame(interoplibrary, pointerObject, ref)"}, //
                         rewriteOn = {CannotCastException.class, InvalidCacheEntry.class}, //
-                        assumptions = "singleContextAssumption(interoplibrary)", //
                         limit = "1")
         static PythonAbstractNativeObject doCachedPointer(@SuppressWarnings("unused") Object pointerObject, @SuppressWarnings("unused") Object refCnt, boolean steal,
                         @Shared("stealProfile") @Cached ConditionProfile stealProfile,
@@ -235,10 +234,6 @@ static boolean isResolved(Object object) {
             return CApiGuards.isNativeWrapper(object) || object instanceof String;
         }
 
-        static Assumption singleContextAssumption(Node node) {
-            return PythonLanguage.get(node).singleContextAssumption;
-        }
-
         static boolean isNoRefCnt(Object refCnt) {
             return refCnt == NO_REF_CNT;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -242,7 +242,7 @@ PNone init(Object self, Object[] arguments, PKeyword[] keywords,
         }
 
         protected static ValueProfile createLookupProfile(Node node) {
-            if (PythonLanguage.get(node).singleContextAssumption.isValid()) {
+            if (PythonLanguage.get(node).isSingleContext()) {
                 return ValueProfile.createIdentityProfile();
             } else {
                 return ValueProfile.createClassProfile();

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

@@ -44,7 +44,6 @@
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.Frame;
@@ -54,15 +53,15 @@
 
 @SuppressWarnings("deprecation")    // new Frame API
 public abstract class PClosureRootNode extends PRootNode {
-    private final Assumption singleContextAssumption;
+    private final boolean isSingleContext;
     private final boolean annotationsAvailable;
     @CompilationFinal(dimensions = 1) protected final com.oracle.truffle.api.frame.FrameSlot[] freeVarSlots;
     @CompilationFinal(dimensions = 1) protected PCell[] closure;
     private final int length;
 
     protected PClosureRootNode(PythonLanguage language, FrameDescriptor frameDescriptor, com.oracle.truffle.api.frame.FrameSlot[] freeVarSlots, boolean hasAnnotations) {
         super(language, frameDescriptor);
-        this.singleContextAssumption = language.singleContextAssumption;
+        this.isSingleContext = language.isSingleContext();
         this.freeVarSlots = freeVarSlots;
         this.length = freeVarSlots != null ? freeVarSlots.length : 0;
         this.annotationsAvailable = hasAnnotations;
@@ -71,10 +70,10 @@ protected PClosureRootNode(PythonLanguage language, FrameDescriptor frameDescrip
     protected final void addClosureCellsToLocals(Frame frame) {
         PCell[] frameClosure = PArguments.getClosure(frame);
         if (frameClosure != null) {
-            if (singleContextAssumption.isValid() && closure == null) {
+            if (isSingleContext && closure == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 closure = frameClosure;
-            } else if (closure != PythonUtils.NO_CLOSURE && ((!singleContextAssumption.isValid() && closure != null) || closure != frameClosure)) {
+            } else if (closure != PythonUtils.NO_CLOSURE && ((!isSingleContext && closure != null) || closure != frameClosure)) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 closure = PythonUtils.NO_CLOSURE;
             }