Move callableStableAssumption to language

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -184,6 +184,12 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     @CompilationFinal(dimensions = 1) private volatile Object[] engineOptionsStorage;
     @CompilationFinal private volatile OptionValues engineOptions;
 
+    /**
+     * A shared assumption that indicates that the delegate of a built-in function that decorates a
+     * native member method or similar did not change.
+     */
+    @CompilationFinal private Assumption callableStableAssumption;
+
     public static int getNumberOfSpecialSingletons() {
         return CONTEXT_INSENSITIVE_SINGLETONS.length;
     }
@@ -767,4 +773,12 @@ private RootCallTarget getOrCreateArithmeticCallTarget(Object arithmeticOperator
         assert callTarget != null;
         return callTarget;
     }
+
+    public Assumption getCallableStableAssumption() {
+        if (callableStableAssumption == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            callableStableAssumption = Truffle.getRuntime().createAssumption("method descriptor delegate stable assumption");
+        }
+        return callableStableAssumption;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -251,12 +251,10 @@
 import com.oracle.graal.python.util.OverflowException;
 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.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Bind;
@@ -510,8 +508,7 @@ Object doPythonCallable(String name, PythonNativeWrapper callable, PExternalFunc
             Object managedCallable = nativeWrapperLibrary.getDelegate(callable);
             RootCallTarget wrappedCallTarget = wrapper.getOrCreateCallTarget(lang, name, false);
             if (wrappedCallTarget != null) {
-                Assumption callableStableAssumption = getCallableStableAssumption();
-                PCell[] closure = ExternalFunctionNodes.createPythonClosure(managedCallable, factory(), callableStableAssumption);
+                PCell[] closure = ExternalFunctionNodes.createPythonClosure(managedCallable, factory(), lang.getCallableStableAssumption());
                 return factory().createBuiltinFunction(name, type, 0, closure, wrappedCallTarget);
             }
             return managedCallable;
@@ -542,8 +539,7 @@ Object doDecoratedManaged(String name, PyCFunctionDecorator callable, PExternalF
             Object managedCallable = nativeWrapperLibrary.getDelegate(callable.getNativeFunction());
             RootCallTarget wrappedCallTarget = wrapper.getOrCreateCallTarget(lang, name, false);
             if (wrappedCallTarget != null) {
-                Assumption callableStableAssumption = getCallableStableAssumption();
-                PCell[] closure = ExternalFunctionNodes.createPythonClosure(managedCallable, factory(), callableStableAssumption);
+                PCell[] closure = ExternalFunctionNodes.createPythonClosure(managedCallable, factory(), lang.getCallableStableAssumption());
                 return factory().createBuiltinFunction(name, type, 0, closure, wrappedCallTarget);
             }
 
@@ -558,8 +554,7 @@ PBuiltinFunction doNativeCallableWithType(String name, Object callable, PExterna
                         @Shared("lang") @CachedLanguage PythonLanguage lang,
                         @SuppressWarnings("unused") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
             RootCallTarget wrappedCallTarget = wrapper.getOrCreateCallTarget(lang, name, true);
-            Assumption callableStableAssumption = getCallableStableAssumption();
-            PCell[] closure = ExternalFunctionNodes.createPythonClosure(callable, factory(), callableStableAssumption);
+            PCell[] closure = ExternalFunctionNodes.createPythonClosure(callable, factory(), lang.getCallableStableAssumption());
             return factory().createBuiltinFunction(name, type, 0, closure, wrappedCallTarget);
         }
 
@@ -574,8 +569,7 @@ PBuiltinFunction doNativeCallableWithoutWrapper(String name, Object callable, Ob
                         @Shared("lang") @CachedLanguage PythonLanguage lang,
                         @SuppressWarnings("unused") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
             RootCallTarget callTarget = PythonUtils.getOrCreateCallTarget(MethDirectRoot.create(lang, name));
-            Assumption callableStableAssumption = getCallableStableAssumption();
-            PCell[] closure = ExternalFunctionNodes.createPythonClosure(callable, factory(), callableStableAssumption);
+            PCell[] closure = ExternalFunctionNodes.createPythonClosure(callable, factory(), lang.getCallableStableAssumption());
             return factory().createBuiltinFunction(name, type, 0, closure, callTarget);
         }
 
@@ -585,19 +579,6 @@ PBuiltinFunction doNativeCallableWithoutWrapperAndType(String name, Object calla
             return doNativeCallableWithoutWrapper(name, callable, null, wrapper, lang, null);
         }
 
-        private Assumption getCallableStableAssumption() {
-            CApiContext cApiContext = getContext().getCApiContext();
-            if (cApiContext != null) {
-                return cApiContext.getCallableStableAssumption();
-            }
-            return createAssumption();
-        }
-
-        @TruffleBoundary
-        private static Assumption createAssumption() {
-            return Truffle.getRuntime().createAssumption();
-        }
-
         static boolean isNativeWrapper(Object obj) {
             return CApiGuards.isNativeWrapper(obj) || isDecoratedManagedFunction(obj);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -41,10 +41,6 @@
 package com.oracle.graal.python.builtins.objects.cext.common;
 
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.truffle.api.Assumption;
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 
 public abstract class CExtContext {
 
@@ -67,12 +63,6 @@ public abstract class CExtContext {
     /** A factory for creating context-specific conversion nodes. */
     private final ConversionNodeSupplier supplier;
 
-    /**
-     * A shared assumption that indicates that the delegate of a built-in function that decorates a
-     * native member method or similar did not change.
-     */
-    @CompilationFinal private Assumption callableStableAssumption;
-
     public CExtContext(PythonContext context, Object llvmLibrary, ConversionNodeSupplier supplier) {
         this.context = context;
         this.llvmLibrary = llvmLibrary;
@@ -115,12 +105,4 @@ public static boolean isMethFastcall(int flags) {
     public static boolean isMethFastcallWithKeywords(int flags) {
         return (flags & METH_FASTCALL) != 0 && (flags & METH_KEYWORDS) != 0;
     }
-
-    public Assumption getCallableStableAssumption() {
-        if (callableStableAssumption == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            callableStableAssumption = Truffle.getRuntime().createAssumption("method descriptor delegate stable assumption");
-        }
-        return callableStableAssumption;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java

@@ -447,7 +447,7 @@ static PBuiltinFunction doIt(GraalHPyContext context, Object methodDef,
             // CPy-style methods
             // TODO(fa) support static and class methods
             PRootNode rootNode = createWrapperRootNode(language, flags, methodName);
-            PCell[] closure = ExternalFunctionNodes.createPythonClosure(mlMethObj, factory, context.getCallableStableAssumption());
+            PCell[] closure = ExternalFunctionNodes.createPythonClosure(mlMethObj, factory, language.getCallableStableAssumption());
             PBuiltinFunction function = factory.createBuiltinFunction(methodName, null, 0, closure, PythonUtils.getOrCreateCallTarget(rootNode));
 
             // write doc string; we need to directly write to the storage otherwise it is disallowed