snapshot mac working again

Author: ktoso

.github/workflows/pull_request.yml

@@ -32,11 +32,11 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
-      - name: Gradle build
+      - name: Gradle :SwiftKit:build
         run: ./gradlew build -x test # just build
-      - name: Gradle check
+      - name: Gradle :SwiftKit:check
         run: ./gradlew :SwiftKit:check --info
-      - name: Gradle compile benchmarks
+      - name: Gradle compile JMH benchmarks
         run: ./gradlew compileJmh --info
 
   test-swift:

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -30,17 +30,14 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
   /// This helps verify that the generated output is correct, and won't miscompile on the next build.
   var buildOutputs: Bool = true
 
-  func createBuildCommands(context: PackagePlugin.PluginContext, target: any PackagePlugin.Target) async throws -> [PackagePlugin.Command] {
+  func createBuildCommands(context: PluginContext, target: any Target) async throws -> [Command] {
     // FIXME: This is not a build plugin but SwiftPM forces us to impleme the protocol anyway? rdar://139556637
     return []
   }
 
   func performCommand(context: PluginContext, arguments: [String]) throws {
     // Plugin can't have dependencies, so we have some naive argument parsing instead:
     self.verbose = arguments.contains("-v") || arguments.contains("--verbose")
-    if !self.verbose {
-        fatalError("Plugin should be verbose")
-    }
 
     let selectedTargets: [String] =
       if let last = arguments.lastIndex(where: { $0.starts(with: "-")}),
@@ -58,7 +55,7 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
 
       do {
         print("[swift-java-command] Extracting Java wrappers from target: '\(target.name)'...")
-        try performCommand(context: context, target: target, arguments: arguments)
+        try performCommand(context: context, target: target, extraArguments: arguments)
       } catch {
         print("[swift-java-command] error: Failed to extract from target '\(target.name)': \(error)")
       }
@@ -67,17 +64,8 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
     print("[swift-java-command] Generating sources: " + "done".green + ".")
   }
 
-  /// Perform the command on a specific target.
-  func performCommand(context: PluginContext, target: Target, arguments: [String]) throws {
-    // Make sure the target can builds properly
-    try self.packageManager.build(.target(target.name), parameters: .init())
-
-    guard let sourceModule = target.sourceModule else { return }
-
-    if self.buildInputs {
-      log("Pre-building target '\(target.name)' before extracting sources...")
-      try self.packageManager.build(.target(target.name), parameters: .init())
-    }
+  func prepareJExtractArguments(context: PluginContext, target: Target) throws -> [String] {
+    guard let sourceModule = target.sourceModule else { return [] }
 
     // Note: Target doesn't have a directoryURL counterpart to directory,
     // so we cannot eliminate this deprecation warning.
@@ -106,6 +94,23 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
     ]
     arguments.append(sourceDir)
 
+    return arguments
+  }
+
+  /// Perform the command on a specific target.
+  func performCommand(context: PluginContext, target: Target, extraArguments _: [String]) throws {
+    // Make sure the target can builds properly
+    try self.packageManager.build(.target(target.name), parameters: .init())
+
+    guard let sourceModule = target.sourceModule else { return }
+
+    if self.buildInputs {
+      log("Pre-building target '\(target.name)' before extracting sources...")
+      try self.packageManager.build(.target(target.name), parameters: .init())
+    }
+
+    let arguments = try prepareJExtractArguments(context: context, target: target)
+
     try runExtract(context: context, target: target, arguments: arguments)
 
     if self.buildOutputs {

Samples/JExtractPluginSampleApp/JExtractPluginSampleLibModule+SwiftJava.swiftdeps~

@@ -48,6 +48,12 @@ def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
     args "build"
 }
 
+def swiftClean = tasks.register("swiftClean", Exec) {
+    workingDir = layout.projectDirectory
+    commandLine "swift"
+    args("package", "clean")
+}
+
 def jextract = tasks.register("jextract", Exec) {
     description = "Builds swift sources, including swift-java source generation"
     dependsOn buildJExtractPlugin
@@ -93,6 +99,10 @@ tasks.build {
     dependsOn("jextract")
 }
 
+tasks.clean {
+    dependsOn("swiftClean")
+}
+
 dependencies {
     implementation(project(':SwiftKit'))
 

Samples/JExtractPluginSampleApp/MyCoolSwiftClass+SwiftJava.swiftdeps~

@@ -22,6 +22,7 @@ public static void main(String[] args) {
         System.out.println("java.library.path = " + SwiftKit.getJavaLibraryPath());
         System.out.println("jextract.trace.downcalls = " + SwiftKit.getJextractTraceDowncalls());
 
+        SwiftKit.loadLibraries(true);
         var o = new MyCoolSwiftClass(12);
         o.exposedToJava();
     }

Samples/JExtractPluginSampleApp/build.gradle

@@ -49,6 +49,12 @@ def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
     args "build"
 }
 
+def swiftClean = tasks.register("swiftClean", Exec) {
+    workingDir = layout.projectDirectory
+    commandLine "swift"
+    args("package", "clean")
+}
+
 def jextract = tasks.register("jextract", Exec) {
     description = "Builds swift sources, including swift-java source generation"
     dependsOn buildJExtractPlugin
@@ -104,6 +110,10 @@ tasks.build {
     dependsOn("jextract")
 }
 
+tasks.clean {
+    dependsOn("swiftClean")
+}
+
 dependencies {
     implementation(project(':SwiftKit'))
 

Samples/JExtractPluginSampleApp/src/main/java/com/example/swift/JExtractPluginSampleMain.java

@@ -446,9 +446,9 @@ extension Swift2JavaTranslator {
                   .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(),
+                  ex.getStackTrace()[2].getFileName(),
+                  ex.getStackTrace()[2].getLineNumber(),
+                  ex.getStackTrace()[2].getMethodName(),
                   traceArgs);
       }
 
@@ -459,9 +459,9 @@ extension Swift2JavaTranslator {
                   .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(),
+                  ex.getStackTrace()[2].getFileName(),
+                  ex.getStackTrace()[2].getLineNumber(),
+                  ex.getStackTrace()[2].getMethodName(),
                   traceArgs);
       }
       """
@@ -884,18 +884,26 @@ extension Swift2JavaTranslator {
       let firstName = p.firstName ?? "_"
       let secondName = p.secondName ?? p.firstName ?? nextUniqueParamName()
 
+      let paramTy: String =
+        if paramPassingStyle == .swiftThunkSelf {
+          "\(p.type.cCompatibleSwiftType)"
+        } else {
+          p.type.swiftTypeName.description
+        }
+
       let param =
         if firstName == secondName {
           // We have to do this to avoid a 'extraneous duplicate parameter name; 'number' already has an argument label' warning
-          "\(firstName): \(p.type.swiftTypeName.description)"
+          "\(firstName): \(paramTy)"
         } else {
-          "\(firstName) \(secondName): \(p.type.swiftTypeName.description)"
+          "\(firstName) \(secondName): \(paramTy)"
         }
       ps.append(param)
     }
 
     if paramPassingStyle == .swiftThunkSelf {
-      ps.append("_self: Any")
+      ps.append("_self: UnsafeMutableRawPointer")
+//      ps.append("_self: Any")
     }
 
     let res = ps.joined(separator: ", ")

Samples/SwiftKitSampleApp/build.gradle

@@ -85,46 +85,48 @@ struct SwiftThunkTranslator {
     let thunkName = self.st.thunkNameRegistry.functionThunkName(
       module: st.swiftModuleName, decl: function)
 
-    // FIXME: handle in thunk: return types
-    // FIXME: handle in thunk: parameters
-    // FIXME: handle in thunk: errors
     return
       [
         """
         @_cdecl("\(raw: thunkName)")
         public func \(raw: thunkName)(\(raw: st.renderSwiftParamDecls(function, paramPassingStyle: nil))) -> Any /* \(raw: parent.swiftTypeName) */ {
-          \(raw: parent.swiftTypeName)(\(raw: st.renderForwardSwiftParams(function, paramPassingStyle: nil)))
+          print("[swift] init class \(raw: parent.swiftTypeName)")
+          return \(raw: parent.swiftTypeName)(\(raw: st.renderForwardSwiftParams(function, paramPassingStyle: nil)))
         }
         """
       ]
   }
 
-
   func render(forFunc decl: ImportedFunc) -> [DeclSyntax] {
     st.log.trace("Rendering thunks for: \(decl.baseIdentifier)")
-//    let funcName = SwiftKitPrinting.Names.functionThunk(
-//      thunkNameRegistry: &st.thunkNameRegistry,
-//      module: st.swiftModuleName,
-//      function: decl)
-    let funcName = st.thunkNameRegistry.functionThunkName(module: st.swiftModuleName, decl: decl)
+    let thunkName = st.thunkNameRegistry.functionThunkName(module: st.swiftModuleName, decl: decl)
 
     // Do we need to pass a self parameter?
     let paramPassingStyle: SelfParameterVariant?
     let callBaseDot: String
       if let parent = decl.parent {
         paramPassingStyle = .swiftThunkSelf
-        // TODO: unsafe bitcast
-        callBaseDot = "(_self as! \(parent.originalSwiftType))."
+        callBaseDot = "unsafeBitCast(_self, to: \(parent.originalSwiftType).self)."
+        // callBaseDot = "(_self as! \(parent.originalSwiftType))."
       } else {
         paramPassingStyle = nil
         callBaseDot = ""
       }
 
+    let returnArrowTy =
+      if decl.returnType.cCompatibleJavaMemoryLayout == .primitive(.void) {
+        "/* \(decl.returnType.swiftTypeName) */"
+      } else {
+        "-> \(decl.returnType.cCompatibleSwiftType) /* \(decl.returnType.swiftTypeName) */"
+      }
+
+    // FIXME: handle in thunk: errors
+
     return
       [
         """
-        @_cdecl("\(raw: funcName)")
-        public func \(raw: funcName)(\(raw: st.renderSwiftParamDecls(decl, paramPassingStyle: paramPassingStyle))) -> \(decl.returnType.cCompatibleSwiftType) /* \(raw: decl.returnType.swiftTypeName) */ {
+        @_cdecl("\(raw: thunkName)")
+        public func \(raw: thunkName)(\(raw: st.renderSwiftParamDecls(decl, paramPassingStyle: paramPassingStyle))) \(raw: returnArrowTy) {
           \(raw: callBaseDot)\(raw: decl.baseIdentifier)(\(raw: st.renderForwardSwiftParams(decl, paramPassingStyle: paramPassingStyle)))
         }
         """

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -38,6 +38,8 @@ package struct ThunkNameRegistry {
         param.firstName ?? "_"
       }.joined(separator: "_")
     }
+      
+      
 
     let name =
       if let parent = decl.parent {