Merge pull request #447 from swiftwasm/yt/fix-6.2-compile

Fix Swift 6.2 compile issue around ExecutorFactory API

Author: kateinoigakukun

.github/workflows/test.yml

@@ -21,12 +21,12 @@ jobs:
             target: "wasm32-unknown-wasi"
           - os: ubuntu-22.04
             toolchain:
-              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
+              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1"
           - os: ubuntu-22.04
             toolchain:
-              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
+              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1-threads"
 
@@ -95,7 +95,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz
       - run: make bootstrap
       - run: ./Utilities/bridge-js-generate.sh
       - name: Check if BridgeJS generated files are up-to-date
@@ -112,7 +112,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz
       - uses: swiftwasm/setup-swiftwasm@v2
         id: setup-wasm32-unknown-wasip1
         with: { target: wasm32-unknown-wasip1 }

Plugins/PackageToJS/Tests/ExampleTests.swift

@@ -246,6 +246,9 @@ extension Trait where Self == ConditionTrait {
         }
     }
 
+    // FIXME: This test fails on Swift 6.3 and later due to memory corruption
+    // Enable it back when https://github.com/swiftlang/swift-driver/pull/1987 is included in the snapshot
+    #if !compiler(>=6.3)
     @Test(.requireSwiftSDK)
     func testing() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())
@@ -313,6 +316,7 @@ extension Trait where Self == ConditionTrait {
         }
     }
     #endif
+    #endif  // compiler(>=6.3)
 
     @Test(.requireSwiftSDK(triple: "wasm32-unknown-wasip1-threads"))
     func multithreading() throws {
@@ -338,6 +342,8 @@ extension Trait where Self == ConditionTrait {
         }
     }
 
+    // FIXME: This test fails on the current main snapshot
+    #if !compiler(>=6.3)
     @Test(.requireEmbeddedSwiftInToolchain(triple: "wasm32-unknown-none-wasm"))
     func embeddedWasmUnknownNone() throws {
         try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
@@ -362,6 +368,7 @@ extension Trait where Self == ConditionTrait {
             )
         }
     }
+    #endif  // compiler(>=6.3)
 
     @Test(.requireSwiftSDK)
     func continuationLeakInTest_XCTest() throws {

Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift

@@ -7,7 +7,7 @@
 import _Concurrency
 import _CJavaScriptKit
 
-#if compiler(>=6.2)
+#if compiler(>=6.3)
 
 // MARK: - MainExecutor Implementation
 // MainExecutor is used by the main actor to execute tasks on the main thread
@@ -104,4 +104,4 @@ extension JavaScriptEventLoop: ExecutorFactory {
     }
 }
 
-#endif  // compiler(>=6.2)
+#endif  // compiler(>=6.3)

Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift

@@ -119,9 +119,9 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable {
     private static func installGlobalExecutorIsolated() {
         guard !didInstallGlobalExecutor else { return }
         didInstallGlobalExecutor = true
-        #if compiler(>=6.2)
+        #if compiler(>=6.3)
         if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999, *) {
-            // For Swift 6.2 and above, we can use the new `ExecutorFactory` API
+            // For Swift 6.3 and above, we can use the new `ExecutorFactory` API
             _Concurrency._createExecutors(factory: JavaScriptEventLoop.self)
         }
         #else

Utilities/build-examples.sh

@@ -2,11 +2,25 @@
 
 set -euo pipefail
 
+EXCLUDED_EXAMPLES=("Embedded")
+
 for example in Examples/*; do
+    skip_example=false
+    for excluded in "${EXCLUDED_EXAMPLES[@]}"; do
+        if [[ "$example" == *"$excluded"* ]]; then
+            skip_example=true
+            break
+        fi
+    done
+    if [ "$skip_example" = true ]; then
+        echo "Skipping $example"
+        continue
+    fi
+
     if [ -d "$example" ] && [ -f "$example/build.sh" ]; then
         echo "Building $example"
         set -x
         (cd "$example" && ./build.sh release)
         { set +x; } 2>/dev/null
     fi
-done
+done