Fixes issue around mutable capture of 'inout' parameter 'buffer' is n…

…ot allowed in concurrently-executing code (#1363)
krzysztofzablocki · Aug 29, 2024 · 4e10fa7 · 4e10fa7
1 parent f1974a5
commit 4e10fa7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/jazzy.yml b/.github/workflows/jazzy.yml
@@ -20,10 +20,10 @@ concurrency:
 
 jobs:
   update_docs:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
-    - name: Set Xcode 15.1.0
-      run: sudo xcode-select -s /Applications/Xcode_15.1.0.app/Contents/Developer
+    - name: Set Xcode 15.3.0
+      run: sudo xcode-select -s /Applications/Xcode_15.3.0.app/Contents/Developer
     - name: Print Current Xcode
       run: xcode-select -p
     - uses: actions/checkout@v3

diff --git a/.github/workflows/release_macOS.yml b/.github/workflows/release_macOS.yml
@@ -17,10 +17,10 @@ jobs:
   build:
     needs: [tests]
     name: Build Sourcery for macOS
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
-      - name: Set Xcode 15.1.0
-        run: sudo xcode-select -s /Applications/Xcode_15.1.0.app/Contents/Developer
+      - name: Set Xcode 15.3.0
+        run: sudo xcode-select -s /Applications/Xcode_15.3.0.app/Contents/Developer
       - name: Print Current Xcode
         run: xcode-select -p
       - uses: actions/checkout@v3

diff --git a/.github/workflows/test_macOS.yml b/.github/workflows/test_macOS.yml
@@ -16,10 +16,10 @@ concurrency:
 
 jobs:
   macos_build:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
-    - name: Set Xcode 15.1.0
-      run: sudo xcode-select -s /Applications/Xcode_15.1.0.app/Contents/Developer
+    - name: Set Xcode 15.3.0
+      run: sudo xcode-select -s /Applications/Xcode_15.3.0.app/Contents/Developer
     - name: Print Current Xcode
       run: xcode-select -p
     - uses: actions/checkout@v3

diff --git a/.github/workflows/test_ubuntu.yml b/.github/workflows/test_ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup Swift
       uses: YOCKOW/Action-setup-swift@main
       with:
-        swift-version: "5.9.2"
+        swift-version: "5.10"
     - name: Get swift version
       run: swift --version
     - uses: actions/checkout@v3

diff --git a/SourceryRuntime/Sources/Common/Array+Parallel.swift b/SourceryRuntime/Sources/Common/Array+Parallel.swift
@@ -17,6 +17,7 @@ public extension Array {
     func parallelMap<T>(transform: (Element) -> T) -> [T] {
         var result = ContiguousArray<T?>(repeating: nil, count: count)
         return result.withUnsafeMutableBufferPointer { buffer in
+            nonisolated(unsafe) let buffer = buffer
             DispatchQueue.concurrentPerform(iterations: buffer.count) { idx in
                 buffer[idx] = transform(self[idx])
             }

diff --git a/SourcerySwift/Sources/SourceryRuntime.content.generated.swift b/SourcerySwift/Sources/SourceryRuntime.content.generated.swift
@@ -191,6 +191,7 @@ public extension Array {
     func parallelMap<T>(transform: (Element) -> T) -> [T] {
         var result = ContiguousArray<T?>(repeating: nil, count: count)
         return result.withUnsafeMutableBufferPointer { buffer in
+            nonisolated(unsafe) let buffer = buffer
             DispatchQueue.concurrentPerform(iterations: buffer.count) { idx in
                 buffer[idx] = transform(self[idx])
             }

diff --git a/SourcerySwift/Sources/SourceryRuntime_Linux.content.generated.swift b/SourcerySwift/Sources/SourceryRuntime_Linux.content.generated.swift
@@ -191,6 +191,7 @@ public extension Array {
     func parallelMap<T>(transform: (Element) -> T) -> [T] {
         var result = ContiguousArray<T?>(repeating: nil, count: count)
         return result.withUnsafeMutableBufferPointer { buffer in
+            nonisolated(unsafe) let buffer = buffer
             DispatchQueue.concurrentPerform(iterations: buffer.count) { idx in
                 buffer[idx] = transform(self[idx])
             }

diff --git a/SourceryTests/Generating/SwiftTemplateSpecs.swift b/SourceryTests/Generating/SwiftTemplateSpecs.swift
@@ -174,7 +174,8 @@ class SwiftTemplateTests: QuickSpec {
                     }
                     .to(throwError(closure: { (error) in
                         let path = Path.cleanTemporaryDir(name: "build").parent() + "/version/Sources/SwiftTemplate/main.swift"
-                        expect("\(error)").to(contain("\(path):11:27: error: missing argument for parameter #1 in call\nsourceryBuffer.append(\"\\( )\");\n                          ^\n"))
+                        expect("\(error)").to(contain("\(path):11:27: error: missing argument for parameter #1 in call"))
+                        expect("\(error)").to(contain("sourceryBuffer.append(\"\\( )\");"))
                     }))
             }