Rename back to see if it makes reviewing easier

Author: rintaro

Sources/JExtractSwift/CDeclLowering/Swift2JavaTranslator+FunctionLowering.swift

@@ -619,14 +619,7 @@ extension LoweredFunctionSignature {
 
   @_spi(Testing)
   public func cFunctionDecl(cName: String) throws -> CFunction {
-    return CFunction(
-      resultType: try CType(cdeclType: self.result.cdeclResultType),
-      name: cName,
-      parameters: try self.allLoweredParameters.map {
-        try CParameter(name: $0.parameterName, type: CType(cdeclType: $0.type).parameterDecay)
-      },
-      isVariadic: false
-    )
+    try CFunction(cdeclSignature: self.cdeclSignature, cName: cName)
   }
 }
 

Sources/JExtractSwift/Swift2Java.swift

@@ -90,7 +90,7 @@ public struct SwiftToJava: ParsableCommand {
 
     try translator.analyze()
     try translator.writeSwiftThunkSources(outputDirectory: outputDirectorySwift)
-    try translator.writeJavaBindingsSources(outputDirectory: outputDirectoryJava)
+    try translator.writeExportedJavaSources(outputDirectory: outputDirectoryJava)
     print("[swift-java] Generated Java sources (\(packageName)) in: \(outputDirectoryJava)/")
     print("[swift-java] Imported Swift module '\(swiftModule)': " + "done.".green)
   }

Sources/JExtractSwift/Swift2JavaTranslator+JavaBindingsPrinting.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Copyright (c) 2024-2025 Apple Inc. and the Swift.org project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,295 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import JavaTypes
-import SwiftSyntax
-import SwiftSyntaxBuilder
-
-// ==== ---------------------------------------------------------------------------------------------------------------
-// MARK: File writing
-
-let PATH_SEPARATOR = "/"  // TODO: Windows
-
-extension Swift2JavaTranslator {
-
-  /// Every imported public type becomes a public class in its own file in Java.
-  public func writeJavaBindingsSources(outputDirectory: String) throws {
-    var printer = CodePrinter()
-    try writeJavaBindingsSources(outputDirectory: outputDirectory, printer: &printer)
-  }
-
-  public func writeJavaBindingsSources(outputDirectory: String, printer: inout CodePrinter) throws {
-    for (_, ty) in importedTypes.sorted(by: { (lhs, rhs) in lhs.key < rhs.key }) {
-      let filename = "\(ty.swiftNominal.name).java"
-      log.info("Printing contents: \(filename)")
-      printImportedNominal(&printer, ty)
-
-      if let outputFile = try printer.writeContents(
-        outputDirectory: outputDirectory,
-        javaPackagePath: javaPackagePath,
-        filename: filename
-      ) {
-        print("[swift-java] Generated: \(ty.swiftNominal.name.bold).java (at \(outputFile))")
-      }
-    }
-
-    do {
-      let filename = "\(self.swiftModuleName).java"
-      log.info("Printing contents: \(filename)")
-      printModule(&printer)
-
-      if let outputFile = try printer.writeContents(
-        outputDirectory: outputDirectory,
-        javaPackagePath: javaPackagePath,
-        filename: filename)
-      {
-        print("[swift-java] Generated: \(self.swiftModuleName).java (at \(outputFile))")
-      }
-    }
-  }
-}
-
-// ==== ---------------------------------------------------------------------------------------------------------------
-// MARK: Java/text printing
 
 extension Swift2JavaTranslator {
-
-  /// Render the Java file contents for an imported Swift module.
-  ///
-  /// This includes any Swift global functions in that module, and some general type information and helpers.
-  public func printModule(_ printer: inout CodePrinter) {
-    printHeader(&printer)
-    printPackage(&printer)
-    printImports(&printer)
-
-    printModuleClass(&printer) { printer in
-      // TODO: print all "static" methods
-      for decl in importedGlobalFuncs {
-        self.log.trace("Print imported decl: \(decl)")
-        printFunctionDowncallMethods(&printer, decl)
-      }
-    }
-  }
-
-  package func printImportedNominal(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
-    printHeader(&printer)
-    printPackage(&printer)
-    printImports(&printer)
-
-    printNominal(&printer, decl) { printer in
-      // Prepare type metadata, we're going to need these when invoking e.g. initializers so cache them in a static.
-      // We call into source swift-java source generated accessors which give us the type of the Swift object:
-      // TODO: seems we no longer need the mangled name per se, so avoiding such constant and downcall
-      //      printer.printParts(
-      //        "public static final String TYPE_MANGLED_NAME = ",
-      //        SwiftKitPrinting.renderCallGetSwiftTypeMangledName(module: self.swiftModuleName, nominal: decl),
-      //        ";"
-      //      )
-
-      // We use a static field to abuse the initialization order such that by the time we get type metadata,
-      // we already have loaded the library where it will be obtained from.
-      printer.printParts(
-        """
-        @SuppressWarnings("unused")
-        private static final boolean INITIALIZED_LIBS = initializeLibs();
-        static boolean initializeLibs() {
-            System.loadLibrary(SwiftKit.STDLIB_DYLIB_NAME);
-            System.loadLibrary("SwiftKitSwift");
-            System.loadLibrary(LIB_NAME);
-            return true;
-        }
-
-        public static final SwiftAnyType TYPE_METADATA =
-            new SwiftAnyType(\(SwiftKitPrinting.renderCallGetSwiftType(module: self.swiftModuleName, nominal: decl)));
-        public final SwiftAnyType $swiftType() {
-            return TYPE_METADATA;
-        }
-        """
-      )
-      printer.println()
-
-      // Layout of the class
-      printClassMemoryLayout(&printer, decl)
-
-      printer.println()
-
-      printer.print(
-        """
-        public \(decl.swiftNominal.name)(MemorySegment segment, SwiftArena arena) {
-          super(segment, arena);
-        }
-        """
-      )
-
-      // Initializers
-      for initDecl in decl.initializers {
-        printInitializerDowncallConstructors(&printer, initDecl)
-      }
-
-      // Properties
-      for accessorDecl in decl.variables {
-        printFunctionDowncallMethods(&printer, accessorDecl)
-      }
-
-      // Methods
-      for funcDecl in decl.methods {
-        printFunctionDowncallMethods(&printer, funcDecl)
-      }
-
-      // Helper methods and default implementations
-      printToStringMethod(&printer, decl)
-    }
-  }
-
-  public func printHeader(_ printer: inout CodePrinter) {
-    printer.print(
-      """
-      // Generated by jextract-swift
-      // Swift module: \(swiftModuleName)
-
-      """
-    )
-  }
-
-  public func printPackage(_ printer: inout CodePrinter) {
-    printer.print(
-      """
-      package \(javaPackage);
-
-      """
-    )
-  }
-
-  public func printImports(_ printer: inout CodePrinter) {
-    for i in Swift2JavaTranslator.defaultJavaImports {
-      printer.print("import \(i);")
-    }
-    printer.print("")
-  }
-
-  package func printNominal(
-    _ printer: inout CodePrinter, _ decl: ImportedNominalType, body: (inout CodePrinter) -> Void
-  ) {
-    let baseProtocol = decl.swiftNominal.isReferenceType ? "SwiftHeapObject" : "SwiftValue"
-
-    printer.printBraceBlock("public final class \(decl.swiftNominal.name) extends SwiftInstance implements \(baseProtocol)") { printer in
-      // Constants
-      printClassConstants(printer: &printer)
-
-      body(&printer)
-    }
-  }
-
-  public func printModuleClass(_ printer: inout CodePrinter, body: (inout CodePrinter) -> Void) {
-    printer.printBraceBlock("public final class \(swiftModuleName)") { printer in
-      printPrivateConstructor(&printer, swiftModuleName)
-
-      // Constants
-      printClassConstants(printer: &printer)
-
-      printer.print(
-        """
-        static MemorySegment findOrThrow(String symbol) {
-            return SYMBOL_LOOKUP.find(symbol)
-                    .orElseThrow(() -> new UnsatisfiedLinkError("unresolved symbol: %s".formatted(symbol)));
-        }
-        """
-      )
-
-      printer.print(
-        """
-        static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
-            try {
-                return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
-            } catch (ReflectiveOperationException ex) {
-                throw new AssertionError(ex);
-            }
-        }
-        """
-      )
-
-      printer.print(
-        """
-        static MemoryLayout align(MemoryLayout layout, long align) {
-            return switch (layout) {
-                case PaddingLayout p -> p;
-                case ValueLayout v -> v.withByteAlignment(align);
-                case GroupLayout g -> {
-                    MemoryLayout[] alignedMembers = g.memberLayouts().stream()
-                            .map(m -> align(m, align)).toArray(MemoryLayout[]::new);
-                    yield g instanceof StructLayout ?
-                            MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
-                }
-                case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
-            };
-        }
-        """
-      )
-
-      // SymbolLookup.libraryLookup is platform dependent and does not take into account java.library.path
-      // https://bugs.openjdk.org/browse/JDK-8311090
-      printer.print(
-        """
-        static final SymbolLookup SYMBOL_LOOKUP = getSymbolLookup();
-        private static SymbolLookup getSymbolLookup() {
-            // Ensure Swift and our Lib are loaded during static initialization of the class.
-            SwiftKit.loadLibrary("swiftCore");
-            SwiftKit.loadLibrary("SwiftKitSwift");
-            SwiftKit.loadLibrary(LIB_NAME);
-
-            if (PlatformUtils.isMacOS()) {
-                return SymbolLookup.libraryLookup(System.mapLibraryName(LIB_NAME), LIBRARY_ARENA)
-                        .or(SymbolLookup.loaderLookup())
-                        .or(Linker.nativeLinker().defaultLookup());
-            } else {
-                return SymbolLookup.loaderLookup()
-                        .or(Linker.nativeLinker().defaultLookup());
-            }
-        }
-        """
-      )
-
-      body(&printer)
-    }
-  }
-
-  private func printClassConstants(printer: inout CodePrinter) {
-    printer.print(
-      """
-      static final String LIB_NAME = "\(swiftModuleName)";
-      static final Arena LIBRARY_ARENA = Arena.ofAuto();
-      """
-    )
-  }
-
-  private func printPrivateConstructor(_ printer: inout CodePrinter, _ typeName: String) {
-    printer.print(
-      """
-      private \(typeName)() {
-        // Should not be called directly
-      }
-
-      // Static enum to force initialization
-      private static enum Initializer {
-        FORCE; // Refer to this to force outer Class initialization (and static{} blocks to trigger)
-      }
-      """
-    )
-  }
-
-  private func printClassMemoryLayout(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
-    printer.print(
-      """
-      private static final GroupLayout $LAYOUT = (GroupLayout) SwiftValueWitnessTable.layoutOfSwiftType(TYPE_METADATA.$memorySegment());
-      public static final GroupLayout $LAYOUT() {
-          return $LAYOUT;
-      }
-      public final GroupLayout $layout() {
-          return $LAYOUT;
-      }
-      """
-    )
-  }
-
   public func printInitializerDowncallConstructors(
     _ printer: inout CodePrinter,
     _ decl: ImportedFunc
@@ -582,23 +295,6 @@ extension Swift2JavaTranslator {
       fatalError("renderMemoryLayoutValue not supported for \(javaType)")
     }
   }
-
-  package func printToStringMethod(
-    _ printer: inout CodePrinter, _ decl: ImportedNominalType
-  ) {
-    printer.print(
-      """
-      @Override
-      public String toString() {
-          return getClass().getSimpleName()
-              + "("
-              + SwiftKit.nameOfSwiftType($swiftType().$memorySegment(), true)
-              + ")@"
-              + $memorySegment();
-      }
-      """)
-  }
-
 }
 
 extension JavaConversionStep {