Resolve conflicts with the main branch

.mailmap

@@ -35,7 +35,7 @@ Dave <davesweeris@mac.com>
 Dave Abrahams <dabrahams@apple.com> <dave@boostpro.com>
 Dave Abrahams <dabrahams@apple.com> <dave@Skree.local>
 Dave Abrahams <dabrahams@apple.com> <dave@Wingy.local>
-Dave Lee <davelee@lyft.com> <davelee.com@gmail.com>
+Dave Lee <davelee.com@gmail.com> <davelee@lyft.com>
 David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
 David Rönnqvist <david.ronnqvist@gmail.com>
 David Ungar <dungar@apple.com> <ungar@mac.com>

CHANGELOG.md

@@ -75,6 +75,31 @@ Swift Next
   }
   ```
 
+* [SE-0297][]:
+
+  An Objective-C method that delivers its results asynchronously via a completion handler block will be translated into an `async` method that directly returns the result (or throws). For example, the following Objective-C method from [CloudKit](https://developer.apple.com/documentation/cloudkit/ckcontainer/1640387-fetchshareparticipantwithuserrec):
+
+  ```objc
+  - (void)fetchShareParticipantWithUserRecordID:(CKRecordID *)userRecordID
+      completionHandler:(void (^)(CKShareParticipant * _Nullable, NSError * _Nullable))completionHandler;
+  ```
+
+  will be translated into an `async throws` method that returns the participant instance:
+
+  ```swift
+  func fetchShareParticipant(
+      withUserRecordID userRecordID: CKRecord.ID
+  ) async throws -> CKShare.Participant
+  ```
+
+  Swift callers can invoke this `async` method within an `await` expression:
+
+  ```swift
+  guard let participant = try? await container.fetchShareParticipant(withUserRecordID: user) else {
+      return nil
+  }
+  ```
+
 * [SE-0298][]:
 
   The "for" loop can be used to traverse asynchronous sequences in asynchronous code:
@@ -8336,6 +8361,7 @@ Swift 1.0
 [SE-0286]: <https://github.com/apple/swift-evolution/blob/main/proposals/0286-forward-scan-trailing-closures.md>
 [SE-0287]: <https://github.com/apple/swift-evolution/blob/main/proposals/0287-implicit-member-chains.md>
 [SE-0296]: <https://github.com/apple/swift-evolution/blob/main/proposals/0296-async-await.md>
+[SE-0297]: <https://github.com/apple/swift-evolution/blob/main/proposals/0297-concurrency-objc.md>
 [SE-0298]: <https://github.com/apple/swift-evolution/blob/main/proposals/0298-asyncsequence.md>
 
 [SR-75]: <https://bugs.swift.org/browse/SR-75>

CMakeLists.txt

@@ -201,7 +201,7 @@ option(USE_SWIFT_ASYNC_LOWERING
         functions if it is supported for the target. The runtime also checks
         this setting before using async-specific attributes. This only applies
         to the async calling convention and not to the async context attribute."
-	FALSE)
+	TRUE)
 
 #
 # User-configurable Swift Standard Library specific options.

benchmark/CMakeLists.txt

@@ -179,6 +179,7 @@ set(SWIFT_BENCH_MODULES
     single-source/StringMatch
     single-source/StringRemoveDupes
     single-source/StringReplaceSubrange
+    single-source/StringSplitting
     single-source/StringSwitch
     single-source/StringTests
     single-source/StringWalk

benchmark/single-source/Differentiation.swift

@@ -40,7 +40,7 @@ public func run_DifferentiationIdentity(N: Int) {
     x
   }
   for _ in 0..<1000*N {
-    blackHole(valueWithGradient(at: 1, in: f))
+    blackHole(valueWithGradient(at: 1, of: f))
   }
 }
 
@@ -50,7 +50,7 @@ public func run_DifferentiationSquare(N: Int) {
     x * x
   }
   for _ in 0..<1000*N {
-    blackHole(valueWithGradient(at: 1, in: f))
+    blackHole(valueWithGradient(at: 1, of: f))
   }
 }
 
@@ -66,7 +66,7 @@ public func run_DifferentiationArraySum(N: Int) {
     return result
   }
   for _ in 0..<N {
-    blackHole(valueWithGradient(at: onesArray, in: sum))
+    blackHole(valueWithGradient(at: onesArray, of: sum))
   }
 }