Merge branch 'swiftlang:main' into implementation/progress-manager

chloe-yeo · web-flow · commit b76985d5b87a · 2025-08-22T11:58:59.000-07:00
diff --git a/Proposals/0023-progress-reporter.md b/Proposals/0023-progress-reporter.md
@@ -347,7 +347,7 @@ overall.assign(count: 3, to: examCountdown.progressReporter)
 
 // Add `ProgressReporter` to another parent `ProgressManager` with different assigned count
 let deadlineTracker = ProgressManager(totalCount: 2) 
-overall.assign(count: 1, to: examCountdown, progressReporter)
+deadlineTracker.assign(count: 1, to: examCountdown.progressReporter)
 ``` 
 
 ### Reporting Progress With Type-Safe Custom Properties 
diff --git a/Sources/FoundationEssentials/AttributedString/AttributeScope.swift b/Sources/FoundationEssentials/AttributedString/AttributeScope.swift
@@ -131,7 +131,7 @@ internal func _loadDefaultAttributes() -> [String : any AttributedStringKey.Type
     // UIKit on macOS
     let macUIScope = (
         "$s10Foundation15AttributeScopesO5UIKitE0D10AttributesVN",
-        "/System/iOSSupport/System/Library/Frameworks/UIKit.framework/UIKit"
+        "/System/iOSSupport/System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore"
     )
     #endif
 
@@ -142,12 +142,12 @@ internal func _loadDefaultAttributes() -> [String : any AttributedStringKey.Type
             // UIKit
             (
                 "$s10Foundation15AttributeScopesO5UIKitE0D10AttributesVN",
-                "/System/Library/Frameworks/UIKit.framework/UIKit"
+                "/System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore"
             ),
             // SwiftUI
             (
                 "$s10Foundation15AttributeScopesO7SwiftUIE0D12UIAttributesVN",
-                "/System/Library/Frameworks/SwiftUI.framework/SwiftUI"
+                "/System/Library/Frameworks/SwiftUICore.framework/SwiftUICore"
             ),
             // Accessibility
             (
diff --git a/Sources/FoundationEssentials/Data/Data+Writing.swift b/Sources/FoundationEssentials/Data/Data+Writing.swift
@@ -157,9 +157,37 @@ private func createTemporaryFile(at destinationPath: String, inPath: PathOrURL,
     
     let pidString = String(ProcessInfo.processInfo.processIdentifier, radix: 16, uppercase: true)
     let template = directoryPath + prefix + pidString + ".XXXXXX"
-    var count = 0
     let maxCount = 7
-    repeat {
+    for _ in 0 ..< maxCount {
+#if FOUNDATION_FRAMEWORK
+        let (sandboxResult, amkrErrno) = inPath.withFileSystemRepresentation { inPathFileSystemRep -> ((Int32, String)?, Int32?) in
+            guard let inPathFileSystemRep else {
+                return (nil, nil)
+            }
+            // First, try _amkrtemp to carry over any sandbox extensions for inPath to the temporary file (even if the application isn't sandboxed)
+            guard let uniqueTempFile = _amkrtemp(inPathFileSystemRep) else {
+                return (nil, errno)
+            }
+            defer { free(uniqueTempFile) }
+            let fd = openFileDescriptorProtected(path: uniqueTempFile, flags: O_CREAT | O_EXCL | O_RDWR, options: options)
+            if fd >= 0 {
+                // Got a good fd
+                return ((fd, String(cString: uniqueTempFile)), nil)
+            }
+            return (nil, errno)
+        }
+        
+        // If _amkrtemp succeeded, return its result
+        if let sandboxResult {
+            return sandboxResult
+        }
+        // If _amkrtemp failed with EEXIST, just retry
+        if amkrErrno == EEXIST {
+            continue
+        }
+        // Otherwise, fall through to mktemp below
+#endif
+        
         let result = try template.withMutableFileSystemRepresentation { templateFileSystemRep -> (Int32, String)? in
             guard let templateFileSystemRep else {
                 throw CocoaError(.fileWriteInvalidFileName)
@@ -187,7 +215,12 @@ private func createTemporaryFile(at destinationPath: String, inPath: PathOrURL,
             
             // If the file exists, we repeat. Otherwise throw the error.
             if errno != EEXIST {
-                throw CocoaError.errorWithFilePath(inPath, errno: errno, reading: false, variant: variant)
+                #if FOUNDATION_FRAMEWORK
+                let debugDescription = "Creating a temporary file via mktemp failed. Creating the temporary file via _amkrtemp previously also failed with errno \(amkrErrno)"
+                #else
+                let debugDescription: String? = nil
+                #endif
+                throw CocoaError.errorWithFilePath(inPath, errno: errno, reading: false, variant: variant, debugDescription: debugDescription)
             }
 
             // Try again
@@ -196,14 +229,10 @@ private func createTemporaryFile(at destinationPath: String, inPath: PathOrURL,
         
         if let result {
             return result
-        } else {
-            count += 1
-            if count > maxCount {
-                // Prevent an infinite loop; even if the error is obscure
-                throw CocoaError(.fileWriteUnknown)
-            }
         }
-    } while true
+    }
+    // We hit max count, prevent an infinite loop; even if the error is obscure
+    throw CocoaError(.fileWriteUnknown)
 #endif // os(WASI)
 }
 
diff --git a/Sources/FoundationEssentials/Decimal/Decimal+Compatibility.swift b/Sources/FoundationEssentials/Decimal/Decimal+Compatibility.swift
@@ -80,23 +80,13 @@ extension Decimal : _ObjectiveCBridgeable {
 // MARK: - Bridging code to C functions
 // We have one implementation function for each, and an entry point for both Darwin (cdecl, exported from the framework), and swift-corelibs-foundation (SPI here and available via that package as API)
 
-#if FOUNDATION_FRAMEWORK
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
 public func pow(_ x: Decimal, _ y: Int) -> Decimal {
     let result = try? x._power(
         exponent: y, roundingMode: .plain
     )
     return result ?? .nan
 }
-#else
-@_spi(SwiftCorelibsFoundation)
-public func _pow(_ x: Decimal, _ y: Int) -> Decimal {
-    let result = try? x._power(
-        exponent: y, roundingMode: .plain
-    )
-    return result ?? .nan
-}
-#endif
 
 private func __NSDecimalAdd(
     _ result: UnsafeMutablePointer<Decimal>,
diff --git a/Sources/FoundationEssentials/Error/CocoaError+FilePath.swift b/Sources/FoundationEssentials/Error/CocoaError+FilePath.swift
@@ -31,12 +31,12 @@ import WinSDK
 // MARK: - Error Creation with CocoaError.Code
 
 extension CocoaError {
-    static func errorWithFilePath(_ code: CocoaError.Code, _ path: String, variant: String? = nil, source: String? = nil, destination: String? = nil) -> CocoaError {
-        CocoaError(code, path: path, variant: variant, source: source, destination: destination)
+    static func errorWithFilePath(_ code: CocoaError.Code, _ path: String, variant: String? = nil, source: String? = nil, destination: String? = nil, debugDescription: String? = nil) -> CocoaError {
+        CocoaError(code, path: path, variant: variant, source: source, destination: destination, debugDescription: debugDescription)
     }
     
-    static func errorWithFilePath(_ code: CocoaError.Code, _ url: URL, variant: String? = nil, source: String? = nil, destination: String? = nil) -> CocoaError {
-        CocoaError(code, url: url, variant: variant, source: source, destination: destination)
+    static func errorWithFilePath(_ code: CocoaError.Code, _ url: URL, variant: String? = nil, source: String? = nil, destination: String? = nil, debugDescription: String? = nil) -> CocoaError {
+        CocoaError(code, url: url, variant: variant, source: source, destination: destination, debugDescription: debugDescription)
     }
 }
 
@@ -81,21 +81,21 @@ extension POSIXError {
 }
 
 extension CocoaError {
-    static func errorWithFilePath(_ pathOrURL: PathOrURL, errno: Int32, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil) -> CocoaError {
+    static func errorWithFilePath(_ pathOrURL: PathOrURL, errno: Int32, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil, debugDescription: String? = nil) -> CocoaError {
         switch pathOrURL {
         case .path(let path):
-            return Self.errorWithFilePath(path, errno: errno, reading: reading, variant: variant, source: source, destination: destination)
+            return Self.errorWithFilePath(path, errno: errno, reading: reading, variant: variant, source: source, destination: destination, debugDescription: debugDescription)
         case .url(let url):
-            return Self.errorWithFilePath(url, errno: errno, reading: reading, variant: variant, source: source, destination: destination)
+            return Self.errorWithFilePath(url, errno: errno, reading: reading, variant: variant, source: source, destination: destination, debugDescription: debugDescription)
         }
     }
     
-    static func errorWithFilePath(_ path: String, errno: Int32, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil) -> CocoaError {
-        CocoaError(Code(fileErrno: errno, reading: reading), path: path, underlying: POSIXError(errno: errno), variant: variant, source: source, destination: destination)
+    static func errorWithFilePath(_ path: String, errno: Int32, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil, debugDescription: String? = nil) -> CocoaError {
+        CocoaError(Code(fileErrno: errno, reading: reading), path: path, underlying: POSIXError(errno: errno), variant: variant, source: source, destination: destination, debugDescription: debugDescription)
     }
     
-    static func errorWithFilePath(_ url: URL, errno: Int32, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil) -> CocoaError {
-        CocoaError(Code(fileErrno: errno, reading: reading), url: url, underlying: POSIXError(errno: errno), variant: variant, source: source, destination: destination)
+    static func errorWithFilePath(_ url: URL, errno: Int32, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil, debugDescription: String? = nil) -> CocoaError {
+        CocoaError(Code(fileErrno: errno, reading: reading), url: url, underlying: POSIXError(errno: errno), variant: variant, source: source, destination: destination, debugDescription: debugDescription)
     }
 }
 
@@ -144,18 +144,18 @@ extension CocoaError.Code {
 }
 
 extension CocoaError {
-    static func errorWithFilePath(_ path: PathOrURL, win32 dwError: DWORD, reading: Bool) -> CocoaError {
+    static func errorWithFilePath(_ path: PathOrURL, win32 dwError: DWORD, reading: Bool, debugDescription: String? = nil) -> CocoaError {
         switch path {
         case let .path(path):
-            return CocoaError(.init(win32: dwError, reading: reading, emptyPath: path.isEmpty), path: path, underlying: Win32Error(dwError))
+            return CocoaError(.init(win32: dwError, reading: reading, emptyPath: path.isEmpty), path: path, underlying: Win32Error(dwError), debugDescription: debugDescription)
         case let .url(url):
             let pathStr = url.withUnsafeFileSystemRepresentation { String(cString: $0!) }
-            return CocoaError(.init(win32: dwError, reading: reading, emptyPath: pathStr.isEmpty), path: pathStr, url: url, underlying: Win32Error(dwError))
+            return CocoaError(.init(win32: dwError, reading: reading, emptyPath: pathStr.isEmpty), path: pathStr, url: url, underlying: Win32Error(dwError), debugDescription: debugDescription)
         }
     }
     
-    static func errorWithFilePath(_ path: String? = nil, win32 dwError: DWORD, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil) -> CocoaError {
-        return CocoaError(.init(win32: dwError, reading: reading, emptyPath: path?.isEmpty), path: path, underlying: Win32Error(dwError), variant: variant, source: source, destination: destination)
+    static func errorWithFilePath(_ path: String? = nil, win32 dwError: DWORD, reading: Bool, variant: String? = nil, source: String? = nil, destination: String? = nil, debugDescription: String? = nil) -> CocoaError {
+        return CocoaError(.init(win32: dwError, reading: reading, emptyPath: path?.isEmpty), path: path, underlying: Win32Error(dwError), variant: variant, source: source, destination: destination, debugDescription: debugDescription)
     }
 }
 #endif
@@ -190,7 +190,8 @@ extension CocoaError {
         underlying: (some Error)? = Optional<CocoaError>.none,
         variant: String? = nil,
         source: String? = nil,
-        destination: String? = nil
+        destination: String? = nil,
+        debugDescription: String? = nil
     ) {
         self.init(
             code,
@@ -199,7 +200,8 @@ extension CocoaError {
             underlying: underlying,
             variant: variant,
             source: source,
-            destination: destination
+            destination: destination,
+            debugDescription: debugDescription
         )
     }
     
@@ -209,7 +211,8 @@ extension CocoaError {
         underlying: (some Error)? = Optional<CocoaError>.none,
         variant: String? = nil,
         source: String? = nil,
-        destination: String? = nil
+        destination: String? = nil,
+        debugDescription: String? = nil
     ) {
         self.init(
             code,
@@ -218,7 +221,8 @@ extension CocoaError {
             underlying: underlying,
             variant: variant,
             source: source,
-            destination: destination
+            destination: destination,
+            debugDescription: debugDescription
         )
     }
     
@@ -229,10 +233,11 @@ extension CocoaError {
         underlying: (some Error)? = Optional<CocoaError>.none,
         variant: String? = nil,
         source: String? = nil,
-        destination: String? = nil
+        destination: String? = nil,
+        debugDescription: String? = nil
     ) {
         #if FOUNDATION_FRAMEWORK
-        self.init(_uncheckedNSError: NSError._cocoaError(withCode: code.rawValue, path: path, url: url, underlying: underlying, variant: variant, source: source, destination: destination) as NSError)
+        self.init(_uncheckedNSError: NSError._cocoaError(withCode: code.rawValue, path: path, url: url, underlying: underlying, variant: variant, source: source, destination: destination, debugDescription: debugDescription) as NSError)
         #else
         var userInfo: [String : Any] = [:]
         if let path {
@@ -253,6 +258,9 @@ extension CocoaError {
         if let variant {
             userInfo[NSUserStringVariantErrorKey] = [variant]
         }
+        if let debugDescription {
+            userInfo[NSDebugDescriptionErrorKey] = debugDescription
+        }
         
         self.init(code, userInfo: userInfo)
         #endif
diff --git a/Sources/FoundationEssentials/NotificationCenter/AsyncMessage+AsyncSequence.swift b/Sources/FoundationEssentials/NotificationCenter/AsyncMessage+AsyncSequence.swift
@@ -34,7 +34,7 @@ extension NotificationCenter {
         of subject: Message.Subject,
         for identifier: Identifier,
         bufferSize limit: Int = 10
-    ) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message, Message.Subject: AnyObject {
+    ) -> some AsyncSequence<Message, Never> & Sendable where Identifier.MessageType == Message, Message.Subject: AnyObject {
         return AsyncMessageSequence<Message>(self, subject, limit)
     }
     
@@ -48,7 +48,7 @@ extension NotificationCenter {
         of subject: Message.Subject.Type,
         for identifier: Identifier,
         bufferSize limit: Int = 10
-    ) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message {
+    ) -> some AsyncSequence<Message, Never> & Sendable where Identifier.MessageType == Message {
         return AsyncMessageSequence<Message>(self, nil, limit)
     }
     
@@ -62,7 +62,7 @@ extension NotificationCenter {
         of subject: Message.Subject? = nil,
         for messageType: Message.Type,
         bufferSize limit: Int = 10
-    ) -> some AsyncSequence<Message, Never> where Message.Subject: AnyObject {
+    ) -> some AsyncSequence<Message, Never> & Sendable where Message.Subject: AnyObject {
         return AsyncMessageSequence<Message>(self, subject, limit)
     }
 }
diff --git a/Sources/FoundationEssentials/Predicate/KeyPath+Inspection.swift b/Sources/FoundationEssentials/Predicate/KeyPath+Inspection.swift
@@ -19,6 +19,8 @@ extension UInt32 {
     private static var COMPUTED_COMPONENT_PAYLOAD_ARGUMENTS_MASK: UInt32 { 0x0008_0000 }
     private static var COMPUTED_COMPONENT_PAYLOAD_SETTABLE_MASK: UInt32 { 0x0040_0000 }
     
+    private static var STORED_COMPONENT_PAYLOAD_MAXIMUM_INLINE_OFFSET: UInt32 { 0x007F_FFFC }
+    
     fileprivate var _keyPathHeader_bufferSize: Int {
         Int(self & Self.KEYPATH_HEADER_BUFFER_SIZE_MASK)
     }
@@ -31,6 +33,11 @@ extension UInt32 {
         self & Self.COMPONENT_HEADER_PAYLOAD_MASK
     }
     
+    fileprivate var _keyPathComponentHeader_storedIsInline: Bool {
+        // If the payload value is greater than the maximum inline offset then it is one of the out-of-line sentinel values
+        _keyPathComponentHeader_payload <= Self.STORED_COMPONENT_PAYLOAD_MAXIMUM_INLINE_OFFSET
+    }
+    
     fileprivate var _keyPathComponentHeader_computedHasArguments: Bool {
         (_keyPathComponentHeader_payload & Self.COMPUTED_COMPONENT_PAYLOAD_ARGUMENTS_MASK) != 0
     }
@@ -40,14 +47,10 @@ extension UInt32 {
     }
 }
 
-private func _keyPathOffset<T>(_ root: T.Type, _ keyPath: AnyKeyPath) -> Int? {
-    MemoryLayout<T>.offset(of: keyPath as! PartialKeyPath<T>)
-}
-
 extension AnyKeyPath {
     private static var WORD_SIZE: Int { MemoryLayout<Int>.size }
     
-    func _validateForPredicateUsage(restrictArguments: Bool = false) {
+    func _validateForPredicateUsage(restrictArguments: Bool = true) {
         var ptr = unsafeBitCast(self, to: UnsafeRawPointer.self)
         ptr = ptr.advanced(by: Self.WORD_SIZE * 3) // skip isa, type metadata, and KVC string pointers
         let header = ptr.load(as: UInt32.self)
@@ -57,11 +60,10 @@ extension AnyKeyPath {
         case 1: // struct/tuple/self stored property
             fallthrough
         case 3: // class stored property
-            // Key paths to stored properties are only single-component if MemoryLayout.offset(of:) returns an offset
-            func project<T>(_: T.Type) -> Bool {
-                _keyPathOffset(T.self, self) == nil
-            }
-            if _openExistential(Self.rootType, do: project) {
+            // Stored property components are either just the payload, or the payload plus 32 bits if the offset is not stored in-line
+            // Note: we cannot use MemoryLayout.offset(of:) here because not all single-component keypaths have direct offsets (for example, stored properties in final classes)
+            let size = (firstComponentHeader._keyPathComponentHeader_storedIsInline) ? MemoryLayout<UInt32>.size : MemoryLayout<UInt64>.size
+            if header._keyPathHeader_bufferSize > size {
                 fatalError("Predicate does not support keypaths with multiple components")
             }
         case 2: // computed
diff --git a/Tests/FoundationEssentialsTests/PredicateTests.swift b/Tests/FoundationEssentialsTests/PredicateTests.swift

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ internal func _loadDefaultAttributes() -> [String : any AttributedStringKey.Type`
`131`	`131`	`// UIKit on macOS`
`132`	`132`	`let macUIScope = (`
`133`	`133`	`"$s10Foundation15AttributeScopesO5UIKitE0D10AttributesVN",`
`134`		`- "/System/iOSSupport/System/Library/Frameworks/UIKit.framework/UIKit"`
	`134`	`+ "/System/iOSSupport/System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore"`
`135`	`135`	`)`
`136`	`136`	`#endif`
`137`	`137`
`@@ -142,12 +142,12 @@ internal func _loadDefaultAttributes() -> [String : any AttributedStringKey.Type`
`142`	`142`	`// UIKit`
`143`	`143`	`(`
`144`	`144`	`"$s10Foundation15AttributeScopesO5UIKitE0D10AttributesVN",`
`145`		`- "/System/Library/Frameworks/UIKit.framework/UIKit"`
	`145`	`+ "/System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore"`
`146`	`146`	`),`
`147`	`147`	`// SwiftUI`
`148`	`148`	`(`
`149`	`149`	`"$s10Foundation15AttributeScopesO7SwiftUIE0D12UIAttributesVN",`
`150`		`- "/System/Library/Frameworks/SwiftUI.framework/SwiftUI"`
	`150`	`+ "/System/Library/Frameworks/SwiftUICore.framework/SwiftUICore"`
`151`	`151`	`),`
`152`	`152`	`// Accessibility`
`153`	`153`	`(`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ extension NotificationCenter {`
`34`	`34`	`of subject: Message.Subject,`
`35`	`35`	`for identifier: Identifier,`
`36`	`36`	`bufferSize limit: Int = 10`
`37`		`- ) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message, Message.Subject: AnyObject {`
	`37`	`+ ) -> some AsyncSequence<Message, Never> & Sendable where Identifier.MessageType == Message, Message.Subject: AnyObject {`
`38`	`38`	`return AsyncMessageSequence<Message>(self, subject, limit)`
`39`	`39`	`}`
`40`	`40`
`@@ -48,7 +48,7 @@ extension NotificationCenter {`
`48`	`48`	`of subject: Message.Subject.Type,`
`49`	`49`	`for identifier: Identifier,`
`50`	`50`	`bufferSize limit: Int = 10`
`51`		`- ) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message {`
	`51`	`+ ) -> some AsyncSequence<Message, Never> & Sendable where Identifier.MessageType == Message {`
`52`	`52`	`return AsyncMessageSequence<Message>(self, nil, limit)`
`53`	`53`	`}`
`54`	`54`
`@@ -62,7 +62,7 @@ extension NotificationCenter {`
`62`	`62`	`of subject: Message.Subject? = nil,`
`63`	`63`	`for messageType: Message.Type,`
`64`	`64`	`bufferSize limit: Int = 10`
`65`		`- ) -> some AsyncSequence<Message, Never> where Message.Subject: AnyObject {`
	`65`	`+ ) -> some AsyncSequence<Message, Never> & Sendable where Message.Subject: AnyObject {`
`66`	`66`	`return AsyncMessageSequence<Message>(self, subject, limit)`
`67`	`67`	`}`
`68`	`68`	`}`