Actually implement the API now

Author: Azoy

stdlib/public/Synchronization/CMakeLists.txt

@@ -43,19 +43,19 @@ if(SWIFT_BUILD_SDK_OVERLAY)
 endif()
 
 set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
-    Mutex/DarwinImpl.swift
+  Mutex/DarwinImpl.swift
 )
 
 # Linux dependencies and sources
 
 set(SWIFT_SYNCHRONIZATION_LINUX_SOURCES
-    Mutex/LinuxImpl.swift
+  Mutex/LinuxImpl.swift
 )
 
 # Wasm dependencies and sources
 
 set(SWIFT_SYNCHRONIZATION_WASM_SOURCES
-    Mutex/WasmImpl.swift
+  Mutex/WasmImpl.swift
 )
 
 # Windows dependencies and sources
@@ -67,7 +67,7 @@ if(SWIFT_BUILD_SDK_OVERLAY)
 endif()
 
 set(SWIFT_SYNCHRONIZATION_WINDOWS_SOURCES
-    Mutex/WindowsImpl.swift
+  Mutex/WindowsImpl.swift
 )
 
 set(SWIFT_SYNCHRNOIZATION_SWIFT_FLAGS

stdlib/public/Synchronization/Cell.swift

@@ -17,6 +17,13 @@ import Builtin
 @usableFromInline
 @_rawLayout(like: Value)
 internal struct _Cell<Value: ~Copyable>: ~Copyable {
+  @available(SwiftStdlib 6.0, *)
+  @_alwaysEmitIntoClient
+  @_transparent
+  var address: UnsafeMutablePointer<Value> {
+    UnsafeMutablePointer<Value>(rawAddress)
+  }
+
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
@@ -28,13 +35,13 @@ internal struct _Cell<Value: ~Copyable>: ~Copyable {
   @_alwaysEmitIntoClient
   @_transparent
   init(_ initialValue: consuming Value) {
-    Builtin.initialize(initialValue, rawAddress)
+    address.initialize(to: initialValue)
   }
 
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @inlinable
   deinit {
-    Builtin.destroy(Value.self, rawAddress)
+    address.deinitialize(count: 1)
   }
 }

stdlib/public/Synchronization/Mutex/DarwinImpl.swift

@@ -32,20 +32,20 @@ internal struct _MutexHandle: ~Copyable {
   @_alwaysEmitIntoClient
   @_transparent
   borrowing func lock() {
-    os_unfair_lock_lock(os_unfair_lock_t(value.rawAddress))
+    os_unfair_lock_lock(value.address)
   }
 
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
   borrowing func tryLock() -> Bool {
-    os_unfair_lock_trylock(os_unfair_lock_t(value.rawAddress))
+    os_unfair_lock_trylock(value.address)
   }
 
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
   borrowing func unlock() {
-    os_unfair_lock_unlock(os_unfair_lock_t(value.rawAddress))
+    os_unfair_lock_unlock(value.address)
   }
 }

stdlib/public/Synchronization/Mutex/Mutex.swift

@@ -53,7 +53,7 @@ public struct Mutex<Value: ~Copyable>: ~Copyable {
 }
 
 @available(SwiftStdlib 6.0, *)
-extension Mutex {
+extension Mutex where Value: ~Copyable {
   /// Attempts to acquire the lock and then calls the given closure if
   /// successful.
   ///
@@ -85,14 +85,22 @@ extension Mutex {
   ///
   /// - Returns: The return value, if any, of the `body` closure parameter
   ///   or nil if the lock couldn't be acquired.
-  // @available(SwiftStdlib 6.0, *)
-  // @_alwaysEmitIntoClient
-  // @_transparent
-  // public borrowing func tryWithLock<Result: ~Copyable & Sendable, E>(
-  //   _ body: @Sendable (inout Value) throws(E) -> Result
-  // ) throws(E) -> Result? {
-  //   fatalError()
-  // }
+  @available(SwiftStdlib 6.0, *)
+  @_alwaysEmitIntoClient
+  @_transparent
+  public borrowing func tryWithLock<Result: ~Copyable & Sendable, E: Error>(
+    _ body: @Sendable (inout Value) throws(E) -> Result
+  ) throws(E) -> Result? {
+    guard handle.tryLock() else {
+      return nil
+    }
+
+    defer {
+      handle.unlock()
+    }
+
+    return try body(&value.address.pointee)
+  }
 
   /// Attempts to acquire the lock and then calls the given closure if
   /// successful.
@@ -128,14 +136,22 @@ extension Mutex {
   ///
   /// - Returns: The return value, if any, of the `body` closure parameter
   ///   or nil if the lock couldn't be acquired.
-  // @available(SwiftStdlib 6.0, *)
-  // @_alwaysEmitIntoClient
-  // @_transparent
-  // public borrowing func tryWithLock<Result: ~Copyable, E>(
-  //   _ body: (inout Value) throws(E) -> Result
-  // ) throws(E) -> Result? {
-  //   fatalError()
-  // }
+  @available(SwiftStdlib 6.0, *)
+  @_alwaysEmitIntoClient
+  @_transparent
+  public borrowing func tryWithLockUnchecked<Result: ~Copyable, E: Error>(
+    _ body: (inout Value) throws(E) -> Result
+  ) throws(E) -> Result? {
+    guard handle.tryLock() else {
+      return nil
+    }
+
+    defer {
+      handle.unlock()
+    }
+
+    return try body(&value.address.pointee)
+  }
 
   /// Calls the given closure after acquring the lock and then releases
   /// ownership.
@@ -163,10 +179,16 @@ extension Mutex {
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
-  public borrowing func withLock<Result: ~Copyable & Sendable, E>(
+  public borrowing func withLock<Result: ~Copyable & Sendable, E: Error>(
     _ body: @Sendable (inout Value) throws(E) -> Result
   ) throws(E) -> Result {
-    fatalError()
+    handle.lock()
+
+    defer {
+      handle.unlock()
+    }
+
+    return try body(&value.address.pointee)
   }
 
   /// Calls the given closure after acquring the lock and then releases
@@ -198,10 +220,16 @@ extension Mutex {
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
-  public borrowing func withLock<Result: ~Copyable, E>(
+  public borrowing func withLockUnchecked<Result: ~Copyable, E: Error>(
     _ body: (inout Value) throws(E) -> Result
   ) throws(E) -> Result {
-    fatalError()
+    handle.lock()
+
+    defer {
+      handle.unlock()
+    }
+
+    return try body(&value.address.pointee)
   }
 }
 

stdlib/public/Synchronization/Mutex/WindowsImpl.swift

@@ -31,21 +31,21 @@ internal struct _MutexHandle: ~Copyable {
   @_alwaysEmitIntoClient
   @_transparent
   borrowing func lock() {
-    AcquireSRWLockExclusive(PSRWLOCK(value.rawAddress))
+    AcquireSRWLockExclusive(value.address)
   }
 
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
   borrowing func tryLock() -> Bool {
     // Windows BOOLEAN gets imported as 'UInt8'...
-    TryAcquireSRWLockExclusive(PSRWLOCK(value.rawAddress)) != 0
+    TryAcquireSRWLockExclusive(value.address) != 0
   }
 
   @available(SwiftStdlib 6.0, *)
   @_alwaysEmitIntoClient
   @_transparent
   borrowing func unlock() {
-    ReleaseSRWLockExclusive(PSRWLOCK(value.rawAddress))
+    ReleaseSRWLockExclusive(value.address)
   }
 }