[GR-35271] Migrate some NFI usages to newer interface.

PullRequest: graalpython/2042

Author: rschatz

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

@@ -238,6 +238,7 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.Source.SourceBuilder;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
+import com.oracle.truffle.nfi.api.SignatureLibrary;
 
 import sun.misc.Unsafe;
 
@@ -1122,6 +1123,12 @@ private static long castLong(Object value) {
         }
     }
 
+    private static Object evalNFI(PythonContext context, String source, String name) {
+        Source src = Source.newBuilder("nfi", source, name).build();
+        CallTarget ct = context.getEnv().parseInternal(src);
+        return ct.call();
+    }
+
     @ExportMessage
     final void toNative() {
         if (!isPointer()) {
@@ -1136,14 +1143,17 @@ final void toNative() {
             }
             if (useNativeFastPaths) {
                 PythonContext context = getContext();
-                Source src = Source.newBuilder("nfi", "load \"" + getJNILibrary() + "\"", "load " + PythonContext.PYTHON_JNI_LIBRARY_NAME).build();
-                CallTarget lib = context.getEnv().parseInternal(src);
                 InteropLibrary interop = InteropLibrary.getUncached();
+                SignatureLibrary signatures = SignatureLibrary.getUncached();
                 try {
-                    Object rlib = lib.call();
-                    Object augmentFunction = interop.invokeMember(interop.readMember(rlib, "initDirectFastPaths"), "bind", "(POINTER):VOID");
-                    interop.execute(augmentFunction, nativePointer);
-                    setNativeSpaceFunction = interop.invokeMember(interop.readMember(rlib, "setHPyContextNativeSpace"), "bind", "(POINTER, SINT64):VOID");
+                    Object rlib = evalNFI(context, "load \"" + getJNILibrary() + "\"", "load " + PythonContext.PYTHON_JNI_LIBRARY_NAME);
+
+                    Object augmentSignature = evalNFI(context, "(POINTER):VOID", "hpy-nfi-signature");
+                    Object augmentFunction = interop.readMember(rlib, "initDirectFastPaths");
+                    signatures.call(augmentSignature, augmentFunction, nativePointer);
+
+                    Object setNativeSpaceSignature = evalNFI(context, "(POINTER, SINT64):VOID", "hpy-nfi-signature");
+                    setNativeSpaceFunction = signatures.bind(setNativeSpaceSignature, interop.readMember(rlib, "setHPyContextNativeSpace"));
 
                     /*
                      * Allocate a native array for the native space pointers of HPy objects and

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIPosixSupport.java

@@ -107,6 +107,7 @@
 import com.oracle.truffle.api.nodes.LanguageInfo;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.nfi.api.SignatureLibrary;
 import com.oracle.truffle.llvm.api.Toolchain;
 
 import sun.misc.Unsafe;
@@ -372,9 +373,15 @@ private static void loadFunction(NFIPosixSupport posix, Object library, PosixNat
             Object unbound;
             try {
                 InteropLibrary interop = InteropLibrary.getUncached();
+                SignatureLibrary sigs = SignatureLibrary.getUncached();
+
+                String sig = String.format("with %s %s", posix.nfiBackend, function.signature);
+                Source sigSrc = Source.newBuilder("nfi", sig, "posix-nfi-signature").internal(true).build();
+                Object signature = posix.context.getEnv().parseInternal(sigSrc).call();
+
                 unbound = interop.readMember(library, function.name());
-                posix.cachedFunctions.set(function.ordinal(), interop.invokeMember(unbound, "bind", function.signature));
-            } catch (UnsupportedMessageException | UnknownIdentifierException | ArityException | UnsupportedTypeException e) {
+                posix.cachedFunctions.set(function.ordinal(), sigs.bind(signature, unbound));
+            } catch (UnsupportedMessageException | UnknownIdentifierException e) {
                 throw CompilerDirectives.shouldNotReachHere(function.name(), e);
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NativeLibrary.java

@@ -62,6 +62,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.nfi.api.SignatureLibrary;
 
 /**
  * Wraps a native library loaded via NFI and provides caching for functions looked up in the
@@ -174,7 +175,7 @@ private Object getCachedFunction(PythonContext context, NativeFunction function)
             // This should be a one-off thing for each context
             CompilerDirectives.transferToInterpreter();
             synchronized (this) {
-                dummy = getFunction(lib, function);
+                dummy = getFunction(context, lib, function);
                 // it is OK to overwrite cachedFunctions[functionIndex] that may have been
                 // written from another thread: no need to double check that it's still null.
                 // dummy is volatile, the object must be fully initialized at this point
@@ -187,15 +188,21 @@ private Object getCachedFunction(PythonContext context, NativeFunction function)
     private Object getFunction(PythonContext context, NativeFunction function) {
         CompilerAsserts.neverPartOfCompilation();
         Object lib = getCachedLibrary(context);
-        return getFunction(lib, function);
+        return getFunction(context, lib, function);
     }
 
-    private Object getFunction(Object lib, NativeFunction function) {
+    private Object parseSignature(PythonContext context, String signature) {
+        Source sigSource = Source.newBuilder("nfi", nfiBackend.withClause + signature, "python-nfi-signature").build();
+        return context.getEnv().parseInternal(sigSource).call();
+    }
+
+    private Object getFunction(PythonContext context, Object lib, NativeFunction function) {
         CompilerAsserts.neverPartOfCompilation();
         try {
+            Object signature = parseSignature(context, function.signature());
             Object symbol = cachedLibraryInterop.readMember(lib, function.name());
-            return InteropLibrary.getUncached().invokeMember(symbol, "bind", function.signature());
-        } catch (UnsupportedMessageException | UnknownIdentifierException | ArityException | UnsupportedTypeException e) {
+            return SignatureLibrary.getUncached().bind(signature, symbol);
+        } catch (UnsupportedMessageException | UnknownIdentifierException e) {
             throw new IllegalStateException(String.format("Cannot load symbol '%s' from the internal shared library '%s'", function.name(), name), e);
         }
     }
@@ -250,9 +257,9 @@ protected Object callUncached(PythonContext context, NativeFunction f, Object...
         final Object lib = getCachedLibrary(context);
         if (lib != null) {
             try {
+                Object signature = parseSignature(context, f.signature());
                 Object symbol = cachedLibraryInterop.readMember(lib, f.name());
-                Object function = InteropLibrary.getUncached(symbol).invokeMember(symbol, "bind", f.signature());
-                return InteropLibrary.getUncached(function).execute(function, args);
+                return SignatureLibrary.getUncached().call(signature, symbol, args);
             } catch (Exception e) {
                 throw CompilerDirectives.shouldNotReachHere(f.name(), e);
             }