cleanups

Author: ktoso

Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/WithBufferTest.java

@@ -28,67 +28,22 @@
 
 public class WithBufferTest {
 
-    /**
-     * {@snippet lang = c:
-     * void swiftjava_SwiftModule_returnArray(void (*_result_initialize)(const void *, ptrdiff_t))
-     *}
-     */
-    private static class swiftjava_SwiftModule_returnArray {
-        private static final FunctionDescriptor DESC = FunctionDescriptor.ofVoid(
-                /* _result_initialize: */SwiftValueLayout.SWIFT_POINTER
-        );
-        private static final MemorySegment ADDR = null;
-        // SwiftModule.findOrThrow("swiftjava_SwiftModule_returnArray");
-        private static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
-
-        public static void call(java.lang.foreign.MemorySegment _result_initialize) {
-            try {
-                if (CallTraces.TRACE_DOWNCALLS) {
-                    CallTraces.traceDowncall(_result_initialize);
-                }
-                HANDLE.invokeExact(_result_initialize);
-            } catch (Throwable ex$) {
-                throw new AssertionError("should not reach here", ex$);
-            }
-        }
-
-        /**
-         * {snippet lang=c :
-         * void (*)(const void *, ptrdiff_t)
-         * }
-         */
-        private static class $_result_initialize {
-            public static final class Function {
-                byte[] result = null;
-
-                void apply(java.lang.foreign.MemorySegment _0, long _1) {
-                    this.result = _0.reinterpret(_1).toArray(ValueLayout.JAVA_BYTE);
-                }
-            }
-
-            private static final FunctionDescriptor DESC = FunctionDescriptor.ofVoid(
-                    /* _0: */SwiftValueLayout.SWIFT_POINTER,
-                    /* _1: */SwiftValueLayout.SWIFT_INT
-            );
-            private static final MethodHandle HANDLE = SwiftRuntime.upcallHandle(Function.class, "apply", DESC);
-
-            private static MemorySegment toUpcallStub(Function fi, Arena arena) {
-                return Linker.nativeLinker().upcallStub(HANDLE.bindTo(fi), DESC, arena);
-            }
-        }
+    @Test
+    void test_withBuffer() {
+        AtomicLong bufferSize = new AtomicLong();
+        MySwiftLibrary.withBuffer((buf) -> {
+            CallTraces.trace("withBuffer{$0.byteSize()}=" + buf.byteSize());
+            bufferSize.set(buf.byteSize());
+        });
+
+        assertEquals(124, bufferSize.get());
     }
 
+    @Test
+    void test_getArray() {
+        AtomicLong bufferSize = new AtomicLong();
+        byte[] javaBytes = MySwiftLibrary.getArray()
 
-}
-
-@Test
-void test_withBuffer() {
-    AtomicLong bufferSize = new AtomicLong();
-    MySwiftLibrary.withBuffer((buf) -> {
-        CallTraces.trace("withBuffer{$0.byteSize()}=" + buf.byteSize());
-        bufferSize.set(buf.byteSize());
-    });
-
-    assertEquals(124, bufferSize.get());
-}
+        assertEquals({1, 2, 3}, bufferSize.get());
+    }
 }

Sources/JExtractSwiftLib/FFM/CDeclLowering/FFMSwift2JavaGenerator+FunctionLowering.swift

@@ -738,13 +738,9 @@ struct CdeclLowering {
                   base: "\(outParameterName)_initialize", 
                   methodName: nil, // just `(...)` apply the closure
                   arguments: [
-                    .init(label: nil, argument: .member(.constant("_0"), member: "baseAddress")),
+                    .init(label: nil, argument: .member(.constant("_0"), member: "baseAddress!")),
                     .init(label: nil, argument: .member(.constant("_0"), member: "count")),
                   ]
-                  // arguments: [
-                  //   .init(label: nil, argument: .member(.placeholder, member: "baseAddress")),
-                  //   .init(label: nil, argument: .member(.placeholder, member: "count")),
-                  // ]
                 )
               )
             )

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -582,7 +582,6 @@ extension FFMSwift2JavaGenerator.JavaConversionStep {
 
   /// Returns the conversion string applied to the placeholder.
   func render(_ printer: inout CodePrinter, _ placeholder: String, placeholderForDowncall: String? = nil) -> String {
-    print("render: \(self)")
     // NOTE: 'printer' is used if the conversion wants to cause side-effects.
     // E.g. storing a temporary values into a variable.
     switch self {