Use InteropLibary to execute Pointer#findNullByte

bjfish · bjfish · commit 7967cad7b7db · 2021-08-18T11:20:39.000-05:00
diff --git a/src/main/java/org/truffleruby/core/encoding/EncodingManager.java b/src/main/java/org/truffleruby/core/encoding/EncodingManager.java
@@ -18,6 +18,9 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.interop.InteropException;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ProcessProperties;
 import org.jcodings.Encoding;
@@ -36,7 +39,6 @@
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.platform.NativeConfiguration;
 import org.truffleruby.platform.TruffleNFIPlatform;
-import org.truffleruby.platform.TruffleNFIPlatform.NativeFunction;
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -151,10 +153,18 @@ private void initializeLocaleEncoding(TruffleNFIPlatform nfi, NativeConfiguratio
 
             // char *nl_langinfo(nl_item item);
             // nl_item is int on at least Linux and macOS
-            final NativeFunction nl_langinfo = nfi.getFunction("nl_langinfo", "(sint32):string");
+            final Object nl_langinfo = nfi.getFunction("nl_langinfo", "(sint32):string");
 
-            final long address = nfi.asPointer(nl_langinfo.call(codeset));
-            final byte[] bytes = new Pointer(address).readZeroTerminatedByteArray(context, 0);
+            final long address;
+            try {
+                address = nfi.asPointer(InteropLibrary.getUncached().execute(nl_langinfo, codeset));
+            } catch (InteropException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
+            final byte[] bytes = new Pointer(address).readZeroTerminatedByteArray(
+                    context,
+                    InteropLibrary.getUncached(),
+                    0);
             localeEncodingName = RopeOperations.decodeAscii(bytes);
         } else {
             localeEncodingName = Charset.defaultCharset().name();
diff --git a/src/main/java/org/truffleruby/core/format/read/bytes/ReadStringPointerNode.java b/src/main/java/org/truffleruby/core/format/read/bytes/ReadStringPointerNode.java
@@ -9,6 +9,7 @@
  */
 package org.truffleruby.core.format.read.bytes;
 
+import com.oracle.truffle.api.interop.InteropLibrary;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.format.FormatFrameDescriptor;
 import org.truffleruby.core.format.FormatNode;
@@ -47,13 +48,18 @@ protected MissingValue decode(Nil nil) {
 
     @Specialization
     protected RubyString read(VirtualFrame frame, long address,
-            @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibrary) {
+            @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibrary,
+            @CachedLibrary(limit = "1") InteropLibrary interop) {
         final Pointer pointer = new Pointer(address);
         checkAssociated(
                 (Pointer[]) FrameUtil.getObjectSafe(frame, FormatFrameDescriptor.SOURCE_ASSOCIATED_SLOT),
                 pointer);
 
-        final byte[] bytes = pointer.readZeroTerminatedByteArray(getContext(), 0, limit);
+        final byte[] bytes = pointer.readZeroTerminatedByteArray(
+                getContext(),
+                interop,
+                0,
+                limit);
         return makeStringNode.executeMake(bytes, Encodings.US_ASCII, CodeRange.CR_7BIT);
     }
 
diff --git a/src/main/java/org/truffleruby/extra/ffi/Pointer.java b/src/main/java/org/truffleruby/extra/ffi/Pointer.java
@@ -11,6 +11,8 @@
 
 import java.lang.reflect.Field;
 
+import com.oracle.truffle.api.interop.InteropException;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import org.truffleruby.RubyContext;
 import org.truffleruby.SuppressFBWarnings;
 import org.truffleruby.core.FinalizationService;
@@ -190,17 +192,29 @@ public double readDouble(long offset) {
         return UNSAFE.getDouble(address + offset);
     }
 
-    public byte[] readZeroTerminatedByteArray(RubyContext context, long offset) {
-        return readBytes(offset, checkStringSize(findNullByte(context, offset)));
+    public byte[] readZeroTerminatedByteArray(RubyContext context, InteropLibrary interopLibrary, long offset) {
+        return readBytes(offset, checkStringSize(findNullByte(
+                context,
+                interopLibrary,
+                offset)));
     }
 
-    public byte[] readZeroTerminatedByteArray(RubyContext context, long offset, long limit) {
-        return readBytes(offset, checkStringSize(findNullByte(context, offset, limit)));
+    public byte[] readZeroTerminatedByteArray(RubyContext context, InteropLibrary interopLibrary, long offset,
+            long limit) {
+        return readBytes(offset, checkStringSize(findNullByte(
+                context,
+                interopLibrary,
+                offset,
+                limit)));
     }
 
-    private long findNullByte(RubyContext context, long offset) {
+    private long findNullByte(RubyContext context, InteropLibrary interopLibrary, long offset) {
         if (context.getOptions().NATIVE_PLATFORM) {
-            return (long) context.getTruffleNFI().getStrlen().call(address + offset);
+            try {
+                return (long) interopLibrary.execute(context.getTruffleNFI().getStrlen(), address + offset);
+            } catch (InteropException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
         } else {
             int n = 0;
             while (true) {
@@ -212,9 +226,13 @@ private long findNullByte(RubyContext context, long offset) {
         }
     }
 
-    private long findNullByte(RubyContext context, long offset, long limit) {
+    private long findNullByte(RubyContext context, InteropLibrary interopLibrary, long offset, long limit) {
         if (context.getOptions().NATIVE_PLATFORM) {
-            return (long) context.getTruffleNFI().getStrnlen().call(address + offset, limit);
+            try {
+                return (long) interopLibrary.execute(context.getTruffleNFI().getStrnlen(), address + offset, limit);
+            } catch (InteropException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
         } else {
             int n = 0;
             while (n < limit) {
diff --git a/src/main/java/org/truffleruby/extra/ffi/PointerNodes.java b/src/main/java/org/truffleruby/extra/ffi/PointerNodes.java
@@ -11,6 +11,7 @@
 
 import java.math.BigInteger;
 
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
@@ -273,10 +274,12 @@ protected RubyString readNullPointer(long address, long limit) {
 
         @Specialization(guards = "limit != 0")
         protected RubyString readStringToNull(long address, long limit,
-                @Cached RopeNodes.MakeLeafRopeNode makeLeafRopeNode) {
+                @Cached RopeNodes.MakeLeafRopeNode makeLeafRopeNode,
+                @CachedLibrary(limit = "1") InteropLibrary interop) {
             final Pointer ptr = new Pointer(address);
             checkNull(ptr);
-            final byte[] bytes = ptr.readZeroTerminatedByteArray(getContext(), 0, limit);
+            final byte[] bytes = ptr
+                    .readZeroTerminatedByteArray(getContext(), interop, 0, limit);
             final Rope rope = makeLeafRopeNode
                     .executeMake(bytes, ASCIIEncoding.INSTANCE, CodeRange.CR_UNKNOWN, NotProvided.INSTANCE);
 
@@ -292,10 +295,12 @@ protected RubyString readStringToNull(long address, long limit,
 
         @Specialization
         protected RubyString readStringToNull(long address, Nil limit,
-                @Cached RopeNodes.MakeLeafRopeNode makeLeafRopeNode) {
+                @Cached RopeNodes.MakeLeafRopeNode makeLeafRopeNode,
+                @CachedLibrary(limit = "1") InteropLibrary interop) {
             final Pointer ptr = new Pointer(address);
             checkNull(ptr);
-            final byte[] bytes = ptr.readZeroTerminatedByteArray(getContext(), 0);
+            final byte[] bytes = ptr
+                    .readZeroTerminatedByteArray(getContext(), interop, 0);
             final Rope rope = makeLeafRopeNode
                     .executeMake(bytes, ASCIIEncoding.INSTANCE, CodeRange.CR_UNKNOWN, NotProvided.INSTANCE);
 
diff --git a/src/main/java/org/truffleruby/language/loader/FeatureLoader.java b/src/main/java/org/truffleruby/language/loader/FeatureLoader.java
@@ -48,7 +48,6 @@
 import org.truffleruby.platform.NativeConfiguration;
 import org.truffleruby.platform.Platform;
 import org.truffleruby.platform.TruffleNFIPlatform;
-import org.truffleruby.platform.TruffleNFIPlatform.NativeFunction;
 import org.truffleruby.shared.Metrics;
 import org.truffleruby.shared.TruffleRuby;
 
@@ -79,7 +78,7 @@ public class FeatureLoader {
     private boolean cextImplementationLoaded = false;
 
     private String cwd = null;
-    private NativeFunction getcwd;
+    private Object getcwd;
     private static final int PATH_MAX = 1024; // jnr-posix hard codes this value
 
     private static final String[] EXTENSIONS = new String[]{ TruffleRuby.EXTENSION, RubyLanguage.CEXT_EXTENSION };
@@ -198,11 +197,19 @@ private String initializeWorkingDirectory() {
         final Pointer buffer = IOThreadBufferAllocateNode
                 .getBuffer(rubyThread, bufferSize, ConditionProfile.getUncached());
         try {
-            final long address = nfi.asPointer(getcwd.call(buffer.getAddress(), bufferSize));
+            final long address;
+            try {
+                address = nfi.asPointer(InteropLibrary.getUncached().execute(getcwd, buffer.getAddress(), bufferSize));
+            } catch (InteropException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
             if (address == 0) {
                 RubyContext.send(context.getCoreLibrary().errnoModule, "handle");
             }
-            final byte[] bytes = buffer.readZeroTerminatedByteArray(context, 0);
+            final byte[] bytes = buffer.readZeroTerminatedByteArray(
+                    context,
+                    InteropLibrary.getUncached(),
+                    0);
             final Encoding localeEncoding = context.getEncodingManager().getLocaleEncoding().jcoding;
             return new String(bytes, EncodingManager.charsetForEncoding(localeEncoding));
         } finally {
diff --git a/src/main/java/org/truffleruby/platform/TruffleNFIPlatform.java b/src/main/java/org/truffleruby/platform/TruffleNFIPlatform.java
@@ -10,7 +10,6 @@
 package org.truffleruby.platform;
 
 import org.truffleruby.RubyContext;
-import org.truffleruby.interop.InteropNodes;
 import org.truffleruby.interop.TranslateInteropExceptionNode;
 
 import com.oracle.truffle.api.CompilerDirectives;
@@ -27,8 +26,8 @@ public class TruffleNFIPlatform {
     final Object defaultLibrary;
 
     private final String size_t;
-    private final NativeFunction strlen;
-    private final NativeFunction strnlen;
+    private final Object strlen;
+    private final Object strnlen;
 
     public TruffleNFIPlatform(RubyContext context) {
         defaultLibrary = context
@@ -98,39 +97,21 @@ private String toNFIType(String type) {
         }
     }
 
-    public NativeFunction getFunction(String functionName, String signature) {
+    public Object getFunction(String functionName, String signature) {
         final Object symbol = lookup(defaultLibrary, functionName);
-        final Object function = bind(symbol, signature);
-        return new NativeFunction(function);
+        return bind(symbol, signature);
     }
 
     public String size_t() {
         return size_t;
     }
 
-    public NativeFunction getStrlen() {
+    public Object getStrlen() {
         return strlen;
     }
 
-    public NativeFunction getStrnlen() {
+    public Object getStrnlen() {
         return strnlen;
     }
 
-    public static class NativeFunction {
-
-        private final Object function;
-        private final InteropLibrary functionInteropLibrary;
-
-        private NativeFunction(Object function) {
-            this.function = function;
-            this.functionInteropLibrary = InteropLibrary.getFactory().getUncached(this.function);
-        }
-
-        public Object call(Object... arguments) {
-            return InteropNodes
-                    .execute(function, arguments, functionInteropLibrary, TranslateInteropExceptionNode.getUncached());
-        }
-
-    }
-
 }
