Merge pull request #1341 from swiftlang/automerge/merge-main-2025-06-09_09-01

Merge `main` into `release/6.2`

Author: parkera

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)
+        }
+    }
+}
+

CMakeLists.txt

@@ -111,13 +111,15 @@ list(APPEND _SwiftFoundation_versions
 list(APPEND _SwiftFoundation_availability_names
     "FoundationPreview"
     "FoundationPredicate"
-    "FoundationPredicateRegex")
+    "FoundationPredicateRegex"
+    "FoundationSpan")
 
 # The aligned availability for each name (in the same order)
 list(APPEND _SwiftFoundation_availability_releases
     ${_SwiftFoundation_BaseAvailability}
     ${_SwiftFoundation_BaseAvailability}
-    ${_SwiftFoundation_BaseAvailability})
+    ${_SwiftFoundation_BaseAvailability}
+    ${_SwiftFoundation_FutureAvailability})
 
 foreach(version ${_SwiftFoundation_versions})
     foreach(name release IN ZIP_LISTS _SwiftFoundation_availability_names _SwiftFoundation_availability_releases)

Package.swift

@@ -9,7 +9,8 @@ import CompilerPluginSupport
 let availabilityTags: [_Availability] = [
     _Availability("FoundationPreview"), // Default FoundationPreview availability,
     _Availability("FoundationPredicate"), // Predicate relies on pack parameter runtime support
-    _Availability("FoundationPredicateRegex") // Predicate regexes rely on new stdlib APIs
+    _Availability("FoundationPredicateRegex"), // Predicate regexes rely on new stdlib APIs
+    _Availability("FoundationSpan", availability: .future), // Availability of Span types
 ]
 let versionNumbers = ["0.1", "0.2", "0.3", "0.4", "6.0.2", "6.1", "6.2"]
 
@@ -134,6 +135,18 @@ let package = Package(
           ] + wasiLibcCSettings,
           swiftSettings: [
             .enableExperimentalFeature("VariadicGenerics"),
+            .enableExperimentalFeature("LifetimeDependence"),
+            .enableExperimentalFeature(
+              "InoutLifetimeDependence",
+              .when(platforms: [.macOS, .iOS, .watchOS, .tvOS, .linux])
+            ),
+            .enableExperimentalFeature(
+              "LifetimeDependenceMutableAccessors",
+              .when(platforms: [.macOS, .iOS, .watchOS, .tvOS, .linux])
+            ),
+            .enableExperimentalFeature("AddressableTypes"),
+            .enableExperimentalFeature("AllowUnsafeAttribute"),
+            .enableExperimentalFeature("BuiltinModule"),
             .enableExperimentalFeature("AccessLevelOnImport")
           ] + availabilityMacros + featureSettings,
           linkerSettings: [
@@ -149,7 +162,16 @@ let package = Package(
             resources: [
                 .copy("Resources")
             ],
-            swiftSettings: availabilityMacros + featureSettings
+            swiftSettings: [
+              .enableExperimentalFeature(
+                "InoutLifetimeDependence",
+                .when(platforms: [.macOS, .iOS, .watchOS, .tvOS, .linux])
+              ),
+              .enableExperimentalFeature(
+                "LifetimeDependenceMutableAccessors",
+                .when(platforms: [.macOS, .iOS, .watchOS, .tvOS, .linux])
+              ),
+            ] + availabilityMacros + featureSettings
         ),
 
         // FoundationInternationalization

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
 

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
 

Proposals/0017-expanded-calendar-support.md

@@ -1,8 +1,9 @@
 # Expanded calendar support
 
-* Proposal: SF-017
+* Proposal: SF-0017
 * Authors: [Dragan Besevic]([email protected])
 * Review Manager: Tina Liu
+* Implementation: https://github.com/swiftlang/swift-foundation/pull/1171
 * Status: **Accepted**
 
 

Proposals/0021-ISO8601ComponentsStyle.md

@@ -2,8 +2,9 @@
 
 * Proposal: SF-0021
 * Author(s): Tony Parker <[email protected]>
-* 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_*