working with snapshot toolchains also on arm

Author: ktoso

Makefile

@@ -37,6 +37,20 @@ BUILD_DIR := .build/$(ARCH_SUBDIR)-apple-macosx
 LIB_SUFFIX := dylib
 endif
 
+ifeq ($(UNAME), Darwin)
+ifeq ("${TOOLCHAINS}", "")
+	SWIFTC := "xcrun swiftc"
+else
+	SWIFTC := "xcrun ${TOOLCHAINS}/usr/bin/swiftc"
+endif
+else
+ifeq ("${TOOLCHAINS}", "")
+	SWIFTC := "swiftc"
+else
+	SWIFTC := "${TOOLCHAINS}/usr/bin/swiftc"
+endif
+endif
+
 SAMPLES_DIR := "Samples"
 
 all: generate-all
@@ -83,13 +97,13 @@ JEXTRACT_BUILD_DIR="$(BUILD_DIR)/jextract"
 define make_swiftinterface
     $(eval $@_MODULE = $(1))
     $(eval $@_FILENAME = $(2))
-	eval swiftc \
+	eval ${SWIFTC} \
 		-emit-module-interface-path ${JEXTRACT_BUILD_DIR}/${$@_MODULE}/${$@_FILENAME}.swiftinterface \
 		-emit-module-path ${JEXTRACT_BUILD_DIR}/${$@_MODULE}/${$@_FILENAME}.swiftmodule \
 		-enable-library-evolution \
-                -Xfrontend -abi-comments-in-module-interface \
+		-Xfrontend -abi-comments-in-module-interface \
 		-module-name ${$@_MODULE} \
-                -Xfrontend -abi-comments-in-module-interface \
+		-Xfrontend -abi-comments-in-module-interface \
 		Sources/${$@_MODULE}/${$@_FILENAME}.swift
 	echo "Generated: ${JEXTRACT_BUILD_DIR}/${$@_MODULE}/${$@_FILENAME}.swiftinterface"
 endef

README.md

@@ -16,6 +16,35 @@ The primary purpose of this repository is to create an environment for collabora
 
 ## Dependencies
 
+### Required Swift Development Toolchains
+
+To build and use this project, currently, you will need to download a custom toolchain which includes some improvements in Swift that this project relies on:
+
+**Required toolchain download:**
+
+- Go to https://www.swift.org/download/
+- Find the "latest" `Trunk Development (main)` toolchain for your OS
+
+If these are too old, you can resort to one of these fallback toolchains:
+
+Fallback development toolchain on **macOS**:
+
+- https://ci.swift.org/job/swift-PR-toolchain-macos/1539/artifact/branch-main/swift-PR-76905-1539-osx.tar.gz
+
+Fallback development toolchain on **Linux (Ubuntu 22.04)**:
+
+```
+URL=$(curl -s "https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastSuccessfulBuild/consoleText" | grep 'Toolchain: ' | sed 's/Toolchain: //g')
+wget ${URL} 
+```
+
+or just use the provided docker image (explained below).
+
+https://www.swift.org/download/
+
+
+### Required JDK versions
+
 This project consists of different modules which have different Swift and Java runtime requirements.
 
 **JavaKit** – the Swift macros allowing the invocation of Java libraries from Swift

Sources/JExtractSwift/Swift2JavaTranslator.swift

@@ -105,60 +105,8 @@ extension Swift2JavaTranslator {
       translator: self
     )
     visitor.walk(sourceFileSyntax)
-
-    try await self.postProcessImportedDecls()
   }
 
-  public func postProcessImportedDecls() async throws {
-    log.debug(
-      "Post process imported decls...",
-      metadata: [
-        "types": "\(importedTypes.count)",
-        "global/funcs": "\(importedGlobalFuncs.count)",
-      ]
-    )
-
-    // FIXME: the use of dylibs to get symbols is a hack we need to remove and replace with interfaces containing mangled names
-    let dylibPath = ".build/arm64-apple-macosx/debug/lib\(swiftModuleName).dylib"
-    guard var dylib = SwiftDylib(path: dylibPath) else {
-      log.warning(
-        """
-        Unable to find mangled names for imported symbols. Dylib not found: \(dylibPath) This method of obtaining symbols is a workaround; it will be removed.
-        """
-      )
-      return
-    }
-
-    importedGlobalFuncs = try await importedGlobalFuncs._mapAsync { funcDecl in
-      let funcDecl = try await dylib.fillInMethodMangledName(funcDecl)
-      log.info("Mapped method '\(funcDecl.identifier)' -> '\(funcDecl.swiftMangledName)'")
-      return funcDecl
-    }
-
-    importedTypes = Dictionary(uniqueKeysWithValues: try await importedTypes._mapAsync { (tyName, tyDecl) in
-      var tyDecl = tyDecl
-      log.info("Mapping type: \(tyDecl.swiftTypeName)")
-
-      tyDecl = try await dylib.fillInTypeMangledName(tyDecl)
-
-      log.info("Mapping members of: \(tyDecl.swiftTypeName)")
-      tyDecl.initializers = try await tyDecl.initializers._mapAsync { initDecl in
-        dylib.log.logLevel = .info
-
-        let initDecl = try await dylib.fillInAllocatingInitMangledName(initDecl)
-        log.info("Mapped initializer '\(initDecl.identifier)' -> '\(initDecl.swiftMangledName)'")
-        return initDecl
-      }
-
-      tyDecl.methods = try await tyDecl.methods._mapAsync { funcDecl in
-        let funcDecl = try await dylib.fillInMethodMangledName(funcDecl)
-        log.info("Mapped method '\(funcDecl.identifier)' -> '\(funcDecl.swiftMangledName)'")
-        return funcDecl
-      }
-
-      return (tyName, tyDecl)
-    })
-  }
 }
 
 // ===== --------------------------------------------------------------------------------------------------------------

Tests/JExtractSwiftTests/FunctionDescriptorImportTests.swift

@@ -141,15 +141,15 @@ extension FunctionDescriptorTests {
     javaPackage: String = "com.example.swift",
     swiftModuleName: String = "SwiftModule",
     logLevel: Logger.Level = .trace,
-    body: (String) async throws -> ()
-  ) async throws {
+    body: (String) throws -> ()
+  ) throws {
     let st = Swift2JavaTranslator(
       javaPackage: javaPackage,
       swiftModuleName: swiftModuleName
     )
     st.log.logLevel = logLevel
 
-    try await st.analyze(swiftInterfacePath: "/fake/Sample.swiftinterface", text: interfaceFile)
+    try st.analyze(swiftInterfacePath: "/fake/Sample.swiftinterface", text: interfaceFile)
 
     let funcDecl = st.importedGlobalFuncs.first {
       $0.baseIdentifier == methodIdentifier
@@ -159,7 +159,7 @@ extension FunctionDescriptorTests {
       st.printFunctionDescriptorValue(&printer, funcDecl)
     }
 
-    try await body(output)
+    try body(output)
   }
 
   func variableAccessorDescriptorTest(
@@ -168,15 +168,15 @@ extension FunctionDescriptorTests {
     javaPackage: String = "com.example.swift",
     swiftModuleName: String = "SwiftModule",
     logLevel: Logger.Level = .trace,
-    body: (String) async throws -> ()
-  ) async throws {
+    body: (String) throws -> ()
+  ) throws {
     let st = Swift2JavaTranslator(
       javaPackage: javaPackage,
       swiftModuleName: swiftModuleName
     )
     st.log.logLevel = logLevel
 
-    try await st.analyze(swiftInterfacePath: "/fake/Sample.swiftinterface", text: interfaceFile)
+    try st.analyze(swiftInterfacePath: "/fake/Sample.swiftinterface", text: interfaceFile)
 
     let varDecl: ImportedVariable? =
       st.importedTypes.values.compactMap {
@@ -192,7 +192,7 @@ extension FunctionDescriptorTests {
       st.printFunctionDescriptorValue(&printer, varDecl.accessorFunc(kind: accessorKind)!, accessorKind: accessorKind)
     }
 
-    try await body(getOutput)
+    try body(getOutput)
   }
 
 }

docker/install_untested_nightly_swift.sh

@@ -16,10 +16,15 @@ set -euo pipefail
 
 echo "Download [nightly] [untested] Swift toolchain for: $(uname -m)"
 
-declare -r SWIFT_UNTESTED_TOOLCHAIN_JOB_URL="https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastSuccessfulBuild/consoleText"
+ARCH="$(arch)"
+if [[ "$ARCH" = "i386" ]]; then
+  SWIFT_UNTESTED_TOOLCHAIN_JOB_URL="https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastSuccessfulBuild/consoleText"
+else
+  SWIFT_UNTESTED_TOOLCHAIN_JOB_URL="https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64/lastSuccessfulBuild/consoleText"
+fi
 
 if [[ "$(grep "22.04" /etc/lsb-release)" = "" ]]; then
-  echo "This script specifically only supports Ubuntu 20.04 due to nightly toolchain availability"
+  echo "This script specifically only supports Ubuntu 22.04 due to nightly toolchain availability"
   exit 1
 fi