Enable synchronization module and add missing patches

Author: kateinoigakukun

schemes/release-6.0/build/build-target-toolchain.sh

@@ -110,6 +110,7 @@ build_target_toolchain() {
     -D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES \
     -D SWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES \
     -D SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP=YES \
+    -D SWIFT_ENABLE_SYNCHRONIZATION=YES \
     -D SWIFT_PRIMARY_VARIANT_SDK=WASI \
     -D SWIFT_PRIMARY_VARIANT_ARCH=wasm32 \
     -D SWIFT_SDKS:STRING=WASI \

schemes/release-6.0/swift-foundation/0008-Guard-out-user-group-related-code-on-WASI-783.patch

@@ -0,0 +1,143 @@
+From 1f5e0a8cc6e45e6be7a6d983877dbd602e5c0ff8 Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Fri, 2 Aug 2024 01:23:13 +0900
+Subject: [PATCH] Guard out user/group related code on WASI (#783)
+
+* Guard out user/group related code on WASI
+
+This change guards out the user/group related code on WASI, as WASI does
+not have the concept of users or groups.
+
+* Throw explicit unsupported error if trying to set user or group on WASI
+
+Instead of implicitly ignoring user-given values, we should throw
+exception to make it clear that those values cannot be set on WASI.
+---
+ Sources/FoundationEssentials/Data/Data+Writing.swift         | 2 ++
+ .../FoundationEssentials/FileManager/FileManager+Files.swift | 5 +++++
+ .../FileManager/FileManager+Utilities.swift                  | 2 +-
+ .../FoundationEssentials/FileManager/FileOperations.swift    | 2 ++
+ Sources/FoundationEssentials/Platform.swift                  | 4 ++--
+ Sources/FoundationEssentials/String/String+Path.swift        | 2 ++
+ 6 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/Sources/FoundationEssentials/Data/Data+Writing.swift b/Sources/FoundationEssentials/Data/Data+Writing.swift
+index 1e75b43..78a9a98 100644
+--- a/Sources/FoundationEssentials/Data/Data+Writing.swift
++++ b/Sources/FoundationEssentials/Data/Data+Writing.swift
+@@ -516,6 +516,7 @@ private func writeToFileAux(path inPath: PathOrURL, buffer: UnsafeRawBufferPoint
+                 
+                 cleanupTemporaryDirectory(at: temporaryDirectoryPath)
+                 
++#if !os(WASI) // WASI does not support fchmod for now
+                 if let mode {
+                     // Try to change the mode if the path has not changed. Do our best, but don't report an error.
+ #if FOUNDATION_FRAMEWORK
+@@ -539,6 +540,7 @@ private func writeToFileAux(path inPath: PathOrURL, buffer: UnsafeRawBufferPoint
+                     fchmod(fd, mode)
+ #endif
+                 }
++#endif // os(WASI)
+             }
+         }
+     }
+diff --git a/Sources/FoundationEssentials/FileManager/FileManager+Files.swift b/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
+index b8cd50a..943ac9e 100644
+--- a/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
++++ b/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
+@@ -928,6 +928,10 @@ extension _FileManagerImpl {
+             let groupID = _readFileAttributePrimitive(attributes[.groupOwnerAccountID], as: UInt.self)
+             
+             if user != nil || userID != nil || group != nil || groupID != nil {
++                #if os(WASI)
++                // WASI does not have the concept of users or groups
++                throw CocoaError.errorWithFilePath(.featureUnsupported, path)
++                #else
+                 // Bias toward userID & groupID - try to prevent round trips to getpwnam if possible.
+                 var leaveUnchanged: UInt32 { UInt32(bitPattern: -1) }
+                 let rawUserID = userID.flatMap(uid_t.init) ?? user.flatMap(Self._userAccountNameToNumber) ?? leaveUnchanged
+@@ -935,6 +939,7 @@ extension _FileManagerImpl {
+                 if chown(fileSystemRepresentation, rawUserID, rawGroupID) != 0 {
+                     throw CocoaError.errorWithFilePath(path, errno: errno, reading: false)
+                 }
++                #endif
+             }
+             
+             try Self._setCatInfoAttributes(attributes, path: path)
+diff --git a/Sources/FoundationEssentials/FileManager/FileManager+Utilities.swift b/Sources/FoundationEssentials/FileManager/FileManager+Utilities.swift
+index 9bac967..4f42f19 100644
+--- a/Sources/FoundationEssentials/FileManager/FileManager+Utilities.swift
++++ b/Sources/FoundationEssentials/FileManager/FileManager+Utilities.swift
+@@ -274,7 +274,7 @@ extension _FileManagerImpl {
+     }
+     #endif
+ 
+-#if !os(Windows)
++#if !os(Windows) && !os(WASI)
+     static func _userAccountNameToNumber(_ name: String) -> uid_t? {
+         name.withCString { ptr in
+             getpwnam(ptr)?.pointee.pw_uid
+diff --git a/Sources/FoundationEssentials/FileManager/FileOperations.swift b/Sources/FoundationEssentials/FileManager/FileOperations.swift
+index 528a7c9..8734fc0 100644
+--- a/Sources/FoundationEssentials/FileManager/FileOperations.swift
++++ b/Sources/FoundationEssentials/FileManager/FileOperations.swift
+@@ -874,12 +874,14 @@ enum _FileOperations {
+         }
+         defer { close(dstfd) }
+ 
++        #if !os(WASI) // WASI doesn't have fchmod for now
+         // Set the file permissions using fchmod() instead of when open()ing to avoid umask() issues
+         let permissions = fileInfo.st_mode & ~S_IFMT
+         guard fchmod(dstfd, permissions) == 0 else {
+             try delegate.throwIfNecessary(errno, String(cString: srcPtr), String(cString: dstPtr))
+             return
+         }
++        #endif
+ 
+         if fileInfo.st_size == 0 {
+             // no copying required
+diff --git a/Sources/FoundationEssentials/Platform.swift b/Sources/FoundationEssentials/Platform.swift
+index 9c3f2d7..4549a45 100644
+--- a/Sources/FoundationEssentials/Platform.swift
++++ b/Sources/FoundationEssentials/Platform.swift
+@@ -114,7 +114,7 @@ private let _cachedUGIDs: (uid_t, gid_t) = {
+ }()
+ #endif
+ 
+-#if !os(Windows)
++#if !os(Windows) && !os(WASI)
+ extension Platform {
+     private static var ROOT_USER: UInt32 { 0 }
+     static func getUGIDs(allowEffectiveRootUID: Bool = true) -> (uid: UInt32, gid: UInt32) {
+@@ -175,7 +175,7 @@ extension Platform {
+         // FIXME: bionic implements this as `return 0;` and does not expose the
+         // function via headers. We should be able to shim this and use the call
+         // if it is available.
+-#if !os(Android)
++#if !os(Android) && !os(WASI)
+         guard issetugid() == 0 else { return nil }
+ #endif
+         if let value = getenv(name) {
+diff --git a/Sources/FoundationEssentials/String/String+Path.swift b/Sources/FoundationEssentials/String/String+Path.swift
+index 477d5d3..aaf62d1 100644
+--- a/Sources/FoundationEssentials/String/String+Path.swift
++++ b/Sources/FoundationEssentials/String/String+Path.swift
+@@ -452,6 +452,7 @@ extension String {
+             return envVar.standardizingPath
+         }
+         
++        #if !os(WASI) // WASI does not have user concept
+         // Next, attempt to find the home directory via getpwnam/getpwuid
+         var pass: UnsafeMutablePointer<passwd>?
+         if let user {
+@@ -465,6 +466,7 @@ extension String {
+         if let dir = pass?.pointee.pw_dir {
+             return String(cString: dir).standardizingPath
+         }
++        #endif
+         
+         // Fallback to HOME for the current user if possible
+         if user == nil, let home = getenv("HOME") {
+-- 
+2.43.2
+