adjust swift source gen tests

Author: ktoso

Tests/JExtractSwiftTests/FuncCallbackImportTests.swift

@@ -69,8 +69,8 @@ final class FuncCallbackImportTests {
                 callMe_callback_handle$ = callMe_callback_handle$.bindTo(callback);
                 Linker linker = Linker.nativeLinker();
                 MemorySegment callback$ = linker.upcallStub(callMe_callback_handle$, callMe_callback_desc$, arena);
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(callback$);
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(callback$);
                 }
                 mh$.invokeExact(callback$);
             } catch (Throwable ex$) {

Tests/JExtractSwiftTests/MethodImportTests.swift

@@ -91,8 +91,8 @@ final class MethodImportTests {
         public static void helloWorld() {
             var mh$ = helloWorld.HANDLE;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall();
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall();
                 }
                 mh$.invokeExact();
             } catch (Throwable ex$) {
@@ -134,8 +134,8 @@ final class MethodImportTests {
         public static void globalTakeInt(long i) {
             var mh$ = globalTakeInt.HANDLE;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(i);
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(i);
                 }
                 mh$.invokeExact(i);
             } catch (Throwable ex$) {
@@ -177,8 +177,8 @@ final class MethodImportTests {
         public static void globalTakeIntLongString(int i32, long l, com.example.swift.String s) {
             var mh$ = globalTakeIntLongString.HANDLE;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(i32, l, s.$memorySegment());
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(i32, l, s.$memorySegment());
                 }
                 mh$.invokeExact(i32, l, s.$memorySegment());
             } catch (Throwable ex$) {
@@ -220,8 +220,8 @@ final class MethodImportTests {
         public static void helloMemberFunction(java.lang.foreign.MemorySegment self$) {
             var mh$ = helloMemberFunction.HANDLE;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(self$);
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(self$);
                 }
                 mh$.invokeExact(self$);
             } catch (Throwable ex$) {
@@ -263,8 +263,8 @@ final class MethodImportTests {
         public static void helloMemberInExtension(java.lang.foreign.MemorySegment self$) {
             var mh$ = helloMemberInExtension.HANDLE;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(self$);
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(self$);
                 }
                 mh$.invokeExact(self$);
             } catch (Throwable ex$) {
@@ -306,8 +306,8 @@ final class MethodImportTests {
         public static void helloMemberFunction(java.lang.foreign.MemorySegment self$) {
             var mh$ = helloMemberFunction.HANDLE;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(self$);
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(self$);
                 }
                 mh$.invokeExact(self$);
             } catch (Throwable ex$) {
@@ -431,8 +431,8 @@ final class MethodImportTests {
         public MySwiftClass(SwiftArena arena, long len, long cap) {
           var mh$ = init_len_cap.HANDLE;
           try {
-              if (TRACE_DOWNCALLS) {
-                traceDowncall(len, cap);
+              if (SwiftKit.TRACE_DOWNCALLS) {
+                SwiftKit.traceDowncall(len, cap);
               }
               this.selfMemorySegment = (MemorySegment) mh$.invokeExact(len, cap, TYPE_METADATA.$memorySegment());
               if (arena != null) {

Tests/JExtractSwiftTests/MethodThunkTests.swift

@@ -40,13 +40,13 @@ final class MethodThunkTests {
         """
         @_cdecl("swiftjava_FakeModule_globalFunc_a_b")
         public func swiftjava_FakeModule_globalFunc_a_b(a: Int32, b: Int64) /* Void */ {
-          globalFunc(a: a, b: b)
+          return globalFunc(a: a, b: b)
         }
         """,
         """
         @_cdecl("swiftjava_FakeModule_globalFunc_a_b$1")
         public func swiftjava_FakeModule_globalFunc_a_b$1(a: Double, b: Int64) /* Void */ {
-          globalFunc(a: a, b: b)
+          return globalFunc(a: a, b: b)
         }
         """
       ]

Tests/JExtractSwiftTests/VariableImportTests.swift

@@ -143,8 +143,8 @@ final class VariableImportTests {
         public static long getCounterInt(java.lang.foreign.MemorySegment self$) {
             var mh$ = counterInt.HANDLE_GET;
             try {
-                if (TRACE_DOWNCALLS) {
-                    traceDowncall(self$);
+                if (SwiftKit.TRACE_DOWNCALLS) {
+                    SwiftKit.traceDowncall(self$);
                 }
                 return (long) mh$.invokeExact(self$);
             } catch (Throwable ex$) {
@@ -173,8 +173,8 @@ final class VariableImportTests {
         public static void setCounterInt(long newValue, java.lang.foreign.MemorySegment self$) {
           var mh$ = counterInt.HANDLE_SET;
           try {
-            if (TRACE_DOWNCALLS) {
-               traceDowncall(newValue, self$);
+            if (SwiftKit.TRACE_DOWNCALLS) {
+               SwiftKit.traceDowncall(newValue, self$);
             }
              mh$.invokeExact(newValue, self$);
           } catch (Throwable ex$) {