move trace functions into SwiftKit; avoid regenerating

Author: ktoso

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -267,9 +267,6 @@ extension Swift2JavaTranslator {
       // Layout of the class
       printClassMemoryLayout(&printer, decl)
 
-      // Render the 'trace' functions etc
-      printTraceFunctionDecls(&printer)
-
       body(&printer)
     }
   }
@@ -282,9 +279,6 @@ extension Swift2JavaTranslator {
       printClassConstants(printer: &printer)
       printTypeMappingDecls(&printer)
 
-      // Render the 'trace' functions etc
-      printTraceFunctionDecls(&printer)
-
       printer.print(
         """
         static MemorySegment findOrThrow(String symbol) {
@@ -443,40 +437,6 @@ extension Swift2JavaTranslator {
     )
   }
 
-  public func printTraceFunctionDecls(_ printer: inout CodePrinter) {
-    printer.print(
-      """
-      static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
-
-      static void traceDowncall(Object... args) {
-          var ex = new RuntimeException();
-
-          String traceArgs = Arrays.stream(args)
-                  .map(Object::toString)
-                  .collect(Collectors.joining(", "));
-          System.out.printf("[java][%s:%d] Downcall: %s(%s)\\n",
-                  ex.getStackTrace()[2].getFileName(),
-                  ex.getStackTrace()[2].getLineNumber(),
-                  ex.getStackTrace()[2].getMethodName(),
-                  traceArgs);
-      }
-
-      static void trace(Object... args) {
-          var ex = new RuntimeException();
-
-          String traceArgs = Arrays.stream(args)
-                  .map(Object::toString)
-                  .collect(Collectors.joining(", "));
-          System.out.printf("[java][%s:%d] %s: %s\\n",
-                  ex.getStackTrace()[2].getFileName(),
-                  ex.getStackTrace()[2].getLineNumber(),
-                  ex.getStackTrace()[2].getMethodName(),
-                  traceArgs);
-      }
-      """
-    )
-  }
-
   public func printClassConstructors(_ printer: inout CodePrinter, _ decl: ImportedFunc) {
     guard let parentName = decl.parent else {
       fatalError("init must be inside a parent type! Was: \(decl)")
@@ -524,8 +484,8 @@ extension Swift2JavaTranslator {
       public \(parentName.unqualifiedJavaTypeName)(SwiftArena arena, \(renderJavaParamDecls(decl, paramPassingStyle: .wrapper))) {
         var mh$ = \(descClassIdentifier).HANDLE;
         try {
-            if (TRACE_DOWNCALLS) {
-              traceDowncall(\(renderForwardJavaParams(decl, paramPassingStyle: nil)));
+            if (SwiftKit.TRACE_DOWNCALLS) {
+              SwiftKit.traceDowncall(\(renderForwardJavaParams(decl, paramPassingStyle: nil)));
             }
 
             this.selfMemorySegment = (MemorySegment) mh$.invokeExact(\(renderForwardJavaParams(decl, paramPassingStyle: nil)), TYPE_METADATA.$memorySegment());
@@ -756,8 +716,8 @@ extension Swift2JavaTranslator {
           \(renderUpcallHandles(decl))
       """,
       """
-          if (TRACE_DOWNCALLS) {
-             traceDowncall(\(renderForwardJavaParams(decl, paramPassingStyle: .memorySegment)));
+          if (SwiftKit.TRACE_DOWNCALLS) {
+             SwiftKit.traceDowncall(\(renderForwardJavaParams(decl, paramPassingStyle: .memorySegment)));
           }
           \(maybeReturnCast) mh$.invokeExact(\(renderForwardJavaParams(decl, paramPassingStyle: paramPassingStyle)));
         } catch (Throwable ex$) {
@@ -809,8 +769,8 @@ extension Swift2JavaTranslator {
       public static \(returnTy) \(decl.baseIdentifier)(\(renderJavaParamDecls(decl, paramPassingStyle: paramPassingStyle))) {
         var mh$ = \(decl.baseIdentifier).HANDLE;
         try {
-          if (TRACE_DOWNCALLS) {
-             traceDowncall(\(renderForwardJavaParams(decl, paramPassingStyle: .memorySegment)));
+          if (SwiftKit.TRACE_DOWNCALLS) {
+             SwiftKit.traceDowncall(\(renderForwardJavaParams(decl, paramPassingStyle: .memorySegment)));
           }
           \(maybeReturnCast) mh$.invokeExact(\(renderForwardJavaParams(decl, paramPassingStyle: paramPassingStyle)));
         } catch (Throwable ex$) {

SwiftKit/src/main/java/org/swift/swiftkit/SwiftKit.java

@@ -62,12 +62,31 @@ private static SymbolLookup getSymbolLookup() {
     public SwiftKit() {
     }
 
-    static void traceDowncall(String name, Object... args) {
-        String traceArgs = Arrays.stream(args)
-                .map(Object::toString)
-                .collect(Collectors.joining(", "));
-        System.out.printf("[java] Downcall: %s(%s)\n", name, traceArgs);
-    }
+  public static void traceDowncall(Object... args) {
+      var ex = new RuntimeException();
+
+      String traceArgs = Arrays.stream(args)
+              .map(Object::toString)
+              .collect(Collectors.joining(", "));
+      System.out.printf("[java][%s:%d] Downcall: %s(%s)\n",
+              ex.getStackTrace()[1].getFileName(),
+              ex.getStackTrace()[1].getLineNumber(),
+              ex.getStackTrace()[1].getMethodName(),
+              traceArgs);
+  }
+
+  public static void trace(Object... args) {
+      var ex = new RuntimeException();
+
+      String traceArgs = Arrays.stream(args)
+              .map(Object::toString)
+              .collect(Collectors.joining(", "));
+      System.out.printf("[java][%s:%d] %s: %s\n",
+              ex.getStackTrace()[1].getFileName(),
+              ex.getStackTrace()[1].getLineNumber(),
+              ex.getStackTrace()[1].getMethodName(),
+              traceArgs);
+  }
 
     static MemorySegment findOrThrow(String symbol) {
         return SYMBOL_LOOKUP.find(symbol)