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

chloe-yeo · web-flow · commit 87de3d2742aa · 2025-06-06T16:12:05.000-07:00
diff --git a/Benchmarks/Benchmarks/Internationalization/BenchmarkLocale.swift b/Benchmarks/Benchmarks/Internationalization/BenchmarkLocale.swift
@@ -13,15 +13,20 @@
 import Benchmark
 import func Benchmark.blackHole
 
-#if FOUNDATION_FRAMEWORK // This test uses CFString
+#if os(macOS) && USE_PACKAGE
+import FoundationEssentials
+import FoundationInternationalization
+#else
 import Foundation
+#endif
 
 let benchmarks = {
     Benchmark.defaultConfiguration.maxIterations = 1_000
     Benchmark.defaultConfiguration.maxDuration = .seconds(3)
     Benchmark.defaultConfiguration.scalingFactor = .kilo
-    Benchmark.defaultConfiguration.metrics = [.cpuTotal, .wallClock, .mallocCountTotal, .throughput]
+    Benchmark.defaultConfiguration.metrics = [.cpuTotal, .wallClock, .throughput, .peakMemoryResident, .peakMemoryResidentDelta]
 
+#if FOUNDATION_FRAMEWORK
     let string1 = "aaA" as CFString
     let string2 = "AAà" as CFString
     let range1 = CFRange(location: 0, length: CFStringGetLength(string1))
@@ -34,5 +39,22 @@ let benchmarks = {
                 CFStringCompareWithOptionsAndLocale(string1, string2, range1, .init(rawValue: 0), nsLocale)
             }
     }
-}
 #endif
+
+    let identifiers = Locale.availableIdentifiers
+    let allComponents = identifiers.map { Locale.Components(identifier: $0) }
+    Benchmark("LocaleInitFromComponents") { benchmark in
+        for components in allComponents {
+            let locale = Locale(components: components)
+            let components2 = Locale.Components(locale: locale)
+            let locale2 = Locale(components: components2) // cache hit
+        }
+    }
+
+    Benchmark("LocaleComponentsInitIdentifer") { benchmark in
+        for identifier in identifiers {
+            let components = Locale.Components(identifier: identifier)
+        }
+    }
+}
+
diff --git a/Proposals/0007-swift-subprocess.md b/Proposals/0007-swift-subprocess.md
@@ -6,7 +6,7 @@
 * Status: **Accepted as 0.1**
 * Bugs: [rdar://118127512](rdar://118127512), [apple/swift-foundation#309](https://github.com/apple/swift-foundation/issues/309)
 * Review: [Pitch](https://forums.swift.org/t/pitch-swift-subprocess/69805/65), [1st review](https://forums.swift.org/t/review-sf-0007-introducing-swift-subprocess/70337), [2nd review](https://forums.swift.org/t/review-2nd-sf-0007-subprocess/76547), [3rd review](https://forums.swift.org/t/review-3rd-sf-0007-subprocess/78078/64)
-
+* Implementation: https://github.com/swiftlang/swift-subprocess
 
 ## Revision History
 
diff --git a/Proposals/0014-attributed-string-discontiguous-operations.md b/Proposals/0014-attributed-string-discontiguous-operations.md
@@ -5,6 +5,7 @@
 * Review Manager: [Tina Liu](https://github.com/itingliu)
 * Status: **Accepted**
 * Review: ([Pitch](https://forums.swift.org/t/pitch-attributedstring-discontiguous-operations/76574)) 
+* Implementation: #1145
 
 ## Introduction
 
diff --git a/Proposals/0017-expanded-calendar-support.md b/Proposals/0017-expanded-calendar-support.md
@@ -1,8 +1,9 @@
 # Expanded calendar support
 
-* Proposal: SF-017
+* Proposal: SF-0017
 * Authors: [Dragan Besevic](dragan@unicode.org)
 * Review Manager: Tina Liu
+* Implementation: https://github.com/swiftlang/swift-foundation/pull/1171
 * Status: **Accepted**
 
 
diff --git a/Proposals/0021-ISO8601ComponentsStyle.md b/Proposals/0021-ISO8601ComponentsStyle.md
@@ -2,8 +2,9 @@
 
 * Proposal: SF-0021
 * Author(s): Tony Parker <anthony.parker@apple.com>
-* Status: **Review: March 19, 2025...March 26, 2025**
+* Status: **Accepted**
 * Intended Release:  _Swift 6.2_
+* Implementation: https://github.com/swiftlang/swift-foundation/pull/1209
 * Review: ([pitch](https://forums.swift.org/t/pitch-iso8601-components-format-style/77990))
 *_Related issues_*
 
diff --git a/Proposals/0023-progress-reporter.md b/Proposals/0023-progress-reporter.md
diff --git a/Proposals/0024-CurrentBundle.md b/Proposals/0024-CurrentBundle.md
@@ -4,6 +4,7 @@
 * Proposal: [SF-0024](0024-filename.md)
 * Authors:[Matt Seaman](https://github.com/matthewseaman), [Andreas Neusuess](https://github.com/Tantalum73)
 * Review Manager: [Tina L](https://github.com/itingliu)
+* Implementation: https://github.com/swiftlang/swift-foundation/pull/1274
 * Status: **Accepted**
 
 
diff --git a/Proposals/0025-markdown-list-delimiters.md b/Proposals/0025-markdown-list-delimiters.md
@@ -4,6 +4,7 @@
 * Authors: [Jeremy Schonfeld](https://github.com/jmschonfeld)
 * Review Manager: TBD
 * Status: **Pitch**
+* Implementation: https://github.com/swiftlang/swift-foundation/pull/1272
 * Review: ([pitch](https://forums.swift.org/t/pitch-markdown-list-delimiters/79174))
 
 ## Revision history
diff --git a/Proposals/0026-preferredLocales.md b/Proposals/0026-preferredLocales.md
@@ -3,7 +3,8 @@
 * Proposal: [SF-0026](0026-preferredLocales.md)
 * Authors: [करन मिश्र · Karan Miśra](https://github.com/karan-misra)
 * Review Manager: TBD
-* Status: **Awaiting review**
+* Status: **Accepted**
+* Implementation: https://github.com/swiftlang/swift-foundation/pull/1315
 * Review: ([pitch](https://forums.swift.org/t/pitch-introduce-locale-preferredlocales/79900))
 
 ## Introduction
diff --git a/Sources/FoundationEssentials/Data/Data.swift b/Sources/FoundationEssentials/Data/Data.swift
@@ -2205,6 +2205,9 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
 
 #if compiler(>=6.2) && $LifetimeDependence
     @available(FoundationSpan 6.2, *)
+#if FOUNDATION_FRAMEWORK
+    @_disfavoredOverload
+#endif // FOUNDATION_FRAMEWORK
     public var bytes: RawSpan {
         @lifetime(borrow self)
         borrowing get {
diff --git a/Sources/FoundationEssentials/Locale/Locale+Components.swift b/Sources/FoundationEssentials/Locale/Locale+Components.swift
@@ -85,6 +85,42 @@ extension Locale {
         public init(languageCode: Locale.LanguageCode? = nil, script: Locale.Script? = nil, languageRegion: Locale.Region? = nil) {
             self.languageComponents = Language.Components(languageCode: languageCode, script: script, region: languageRegion)
         }
+
+        // Returns an ICU-style identifier like "de_DE@calendar=gregorian"
+        // Must include every component stored by a `Locale.Components`, and be kept in sync with `init(identifier:)`.
+        package var icuIdentifier: String {
+
+            var keywords = [(ICULegacyKey, String)]()
+            if let id = calendar?.cldrIdentifier { keywords.append((Calendar.Identifier.legacyKeywordKey, id)) }
+            if let id = collation?._normalizedIdentifier { keywords.append((Locale.Collation.legacyKeywordKey, id)) }
+            if let id = currency?._normalizedIdentifier { keywords.append((Locale.Currency.legacyKeywordKey, id)) }
+            if let id = numberingSystem?._normalizedIdentifier { keywords.append((Locale.NumberingSystem.legacyKeywordKey, id)) }
+            if let id = firstDayOfWeek?.rawValue { keywords.append((Locale.Weekday.legacyKeywordKey, id)) }
+            if let id = hourCycle?.rawValue { keywords.append((Locale.HourCycle.legacyKeywordKey, id)) }
+            if let id = measurementSystem?._normalizedIdentifier { keywords.append((Locale.MeasurementSystem.legacyKeywordKey, id)) }
+            // No need for redundant region keyword
+            if let region = region, region != languageComponents.region {
+                // rg keyword value is actually a subdivision code
+                keywords.append((Locale.Region.legacyKeywordKey, Locale.Subdivision.subdivision(for: region)._normalizedIdentifier))
+            }
+            if let id = subdivision?._normalizedIdentifier { keywords.append((Locale.Subdivision.legacyKeywordKey, id)) }
+            if let id = timeZone?.identifier { keywords.append((TimeZone.legacyKeywordKey, id)) }
+            if let id = variant?._normalizedIdentifier { keywords.append((Locale.Variant.legacyKeywordKey, id)) }
+
+            var locID = languageComponents.identifier
+            let keywordCounts = keywords.count
+            if keywordCounts > 0 {
+                locID.append("@")
+            }
+
+            for (i, (key, val)) in keywords.enumerated() {
+                locID.append("\(key.key)=\(val)")
+                if i != keywordCounts - 1 {
+                    locID.append(";")
+                }
+            }
+            return locID
+        }
     }
 }
 
diff --git a/Sources/FoundationEssentials/Locale/Locale_Cache.swift b/Sources/FoundationEssentials/Locale/Locale_Cache.swift
@@ -45,7 +45,7 @@ struct LocaleCache : Sendable, ~Copyable {
         }
 
         private var cachedFixedLocales: [String : any _LocaleProtocol] = [:]
-        private var cachedFixedComponentsLocales: [Locale.Components : any _LocaleProtocol] = [:]
+        private var cachedFixedComponentsLocales: [String /*ICU identifier*/: any _LocaleProtocol] = [:]
 
 #if FOUNDATION_FRAMEWORK
         private var cachedFixedIdentifierToNSLocales: [String : _NSSwiftLocale] = [:]
@@ -99,17 +99,14 @@ struct LocaleCache : Sendable, ~Copyable {
 
 #endif // FOUNDATION_FRAMEWORK
 
-        func fixedComponents(_ comps: Locale.Components) -> (any _LocaleProtocol)? {
-            cachedFixedComponentsLocales[comps]
-        }
-
         mutating func fixedComponentsWithCache(_ comps: Locale.Components) -> any _LocaleProtocol {
-            if let l = fixedComponents(comps) {
+            let identifier = comps.icuIdentifier
+            if let l = cachedFixedComponentsLocales[identifier] {
                 return l
             } else {
                 let new = _localeICUClass().init(components: comps)
 
-                cachedFixedComponentsLocales[comps] = new
+                cachedFixedComponentsLocales[identifier] = new
                 return new
             }
         }
diff --git a/Sources/FoundationInternationalization/Locale/Locale+Components_ICU.swift b/Sources/FoundationInternationalization/Locale/Locale+Components_ICU.swift
@@ -22,34 +22,7 @@ internal import _FoundationICU
 
 @available(macOS 13, iOS 16, tvOS 16, watchOS 9, *)
 extension Locale.Components {
-    // Returns an ICU-style identifier like "de_DE@calendar=gregorian"
-    internal var icuIdentifier: String {
-        var keywords: [ICULegacyKey: String] = [:]
-        if let id = calendar?.cldrIdentifier { keywords[Calendar.Identifier.legacyKeywordKey] = id }
-        if let id = collation?._normalizedIdentifier { keywords[Locale.Collation.legacyKeywordKey] = id }
-        if let id = currency?._normalizedIdentifier { keywords[Locale.Currency.legacyKeywordKey] = id }
-        if let id = numberingSystem?._normalizedIdentifier { keywords[Locale.NumberingSystem.legacyKeywordKey] = id }
-        if let id = firstDayOfWeek?.rawValue { keywords[Locale.Weekday.legacyKeywordKey] = id }
-        if let id = hourCycle?.rawValue { keywords[Locale.HourCycle.legacyKeywordKey] = id }
-        if let id = measurementSystem?._normalizedIdentifier { keywords[Locale.MeasurementSystem.legacyKeywordKey] = id }
-        // No need for redundant region keyword
-        if let region = region, region != languageComponents.region {
-            // rg keyword value is actually a subdivision code
-            keywords[Locale.Region.legacyKeywordKey] = Locale.Subdivision.subdivision(for: region)._normalizedIdentifier
-        }
-        if let id = subdivision?._normalizedIdentifier { keywords[Locale.Subdivision.legacyKeywordKey] = id }
-        if let id = timeZone?.identifier { keywords[TimeZone.legacyKeywordKey] = id }
-        if let id = variant?._normalizedIdentifier { keywords[Locale.Variant.legacyKeywordKey] = id }
-
-        var locID = languageComponents.identifier
-        for (key, val) in keywords {
-            // This uses legacy key-value pairs, like "collation=phonebook" instead of "-cu-phonebk", so be sure that the above values are `legacyKeywordKey`
-            // See Locale.Components.legacyKey(forKey:) for more info on performance costs
-            locID = Locale.identifierWithKeywordValue(locID, key: key, value: val)
-        }
-        return locID
-    }
-    
+
     /// - Parameter identifier: Unicode language identifier such as "en-u-nu-thai-ca-buddhist-kk-true"
     public init(identifier: String) {
         let languageComponents = Locale.Language.Components(identifier: identifier)
diff --git a/Sources/_FoundationCShims/include/_CStdlib.h b/Sources/_FoundationCShims/include/_CStdlib.h
@@ -101,10 +101,6 @@
 #include <stdlib.h>
 #endif
 
-#if __has_include(<stdnoreturn.h>)
-#include <stdnoreturn.h>
-#endif
-
 #if __has_include(<string.h>)
 #include <string.h>
 #endif
@@ -164,5 +160,10 @@
 
 #endif
 
+// Must be last to avoid conflicts with other headers on Windows.
+#if __has_include(<stdnoreturn.h>)
+#include <stdnoreturn.h>
+#endif
+
 #endif // FOUNDATION_CSTDLIB
 
