Use cached SignatureLibrary

Author: fangerer

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

@@ -1198,14 +1198,14 @@ private static Source buildNFISource(Object srcObj) {
         return Source.newBuilder(J_NFI_LANGUAGE, (String) srcObj, "exec").build();
     }
 
-    public long registerClosure(String nfiSignature, Object executable, Object delegate) {
+    public long registerClosure(String nfiSignature, Object executable, Object delegate, SignatureLibrary signatureLibrary) {
         CompilerAsserts.neverPartOfCompilation();
         PythonContext context = getContext();
-        boolean panama = PythonOptions.UsePanama.getValue(context.getEnv().getOptions());
+        boolean panama = context.getOption(PythonOptions.UsePanama);
         String srcString = (panama ? "with panama " : "") + nfiSignature;
         Source nfiSource = context.getLanguage().getOrCreateSource(CApiContext::buildNFISource, srcString);
         Object signature = context.getEnv().parseInternal(nfiSource).call();
-        Object closure = SignatureLibrary.getUncached().createClosure(signature, executable);
+        Object closure = signatureLibrary.createClosure(signature, executable);
         long pointer = PythonUtils.coerceToLong(closure, InteropLibrary.getUncached());
         setClosurePointer(closure, delegate, executable, pointer);
         return pointer;

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

@@ -1761,6 +1761,7 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                         @Cached CStructAccess.ReadPointerNode readPointerNode,
                         @Cached CStructAccess.ReadI32Node readI32Node,
                         @CachedLibrary(limit = "3") InteropLibrary interopLib,
+                        @CachedLibrary(limit = "1") SignatureLibrary signatureLibrary,
                         @Cached PRaiseNode raiseNode) {
             InteropLibrary U = InteropLibrary.getUncached();
             // call to type the pointer
@@ -1800,7 +1801,7 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                             if (!U.isExecutable(execFunction)) {
                                 boolean panama = context.getOption(PythonOptions.UsePanama);
                                 Object signature = context.getEnv().parseInternal(panama ? NFI_PANAMA_EXEC : NFI_LIBFFI_EXEC).call();
-                                execFunction = SignatureLibrary.getUncached().bind(signature, execFunction);
+                                execFunction = signatureLibrary.bind(signature, execFunction);
                             }
                             Object result = interopLib.execute(execFunction, PythonToNativeNode.executeUncached(module));
                             int iResult = interopLib.asInt(result);

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

@@ -62,9 +62,11 @@
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.nfi.api.SignatureLibrary;
 
 /**
  * Wrappers for methods used by native code.
@@ -90,9 +92,11 @@ public long asPointer() {
 
         @ExportMessage
         @TruffleBoundary
-        public void toNative() {
+        public void toNative(
+                        @CachedLibrary(limit = "1") SignatureLibrary signatureLibrary) {
             if (!isPointer()) {
-                setNativePointer(PythonContext.get(null).getCApiContext().registerClosure(getSignature(), this, getDelegate()));
+                CApiContext cApiContext = PythonContext.get(null).getCApiContext();
+                setNativePointer(cApiContext.registerClosure(getSignature(), this, getDelegate(), signatureLibrary));
             }
         }
 

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

@@ -83,10 +83,12 @@
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.strings.TruffleString;
+import com.oracle.truffle.nfi.api.SignatureLibrary;
 
 /**
  * A wrapper class for managed functions such that they can be called with native function pointers
@@ -157,9 +159,11 @@ protected Object execute(Object[] arguments) throws UnsupportedTypeException, Ar
 
     @ExportMessage
     @TruffleBoundary
-    protected void toNative() {
+    protected void toNative(
+                    @CachedLibrary(limit = "1") SignatureLibrary signatureLibrary) {
         if (pointer == 0) {
-            pointer = PythonContext.get(null).getCApiContext().registerClosure(getSignature(), this, getDelegate());
+            CApiContext cApiContext = PythonContext.get(null).getCApiContext();
+            pointer = cApiContext.registerClosure(getSignature(), this, getDelegate(), signatureLibrary);
         }
     }
 

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

@@ -79,10 +79,12 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
+import com.oracle.truffle.nfi.api.SignatureLibrary;
 
 @ExportLibrary(InteropLibrary.class)
 public abstract class PyProcsWrapper extends PythonStructNativeWrapper {
@@ -119,9 +121,11 @@ protected long asPointer() {
 
     @ExportMessage
     @TruffleBoundary
-    protected void toNative() {
+    protected void toNative(
+                    @CachedLibrary(limit = "1") SignatureLibrary signatureLibrary) {
         if (!isPointer()) {
-            setNativePointer(PythonContext.get(null).getCApiContext().registerClosure(getSignature(), this, getDelegate()));
+            CApiContext cApiContext = PythonContext.get(null).getCApiContext();
+            setNativePointer(cApiContext.registerClosure(getSignature(), this, getDelegate(), signatureLibrary));
         }
     }