From 85633139bfb9920c036c4ad1173975681573854a Mon Sep 17 00:00:00 2001 From: Pavel Yaskevich Date: Tue, 23 Jun 2026 13:34:45 -0700 Subject: [PATCH] Rename internal `passRetained` helper to `_passRetained` This avoids ambiguity with a public version of the same API that is part of a Swift standard library and returns a non-optional result. --- Sources/Atomics/Protocols/AtomicReference.swift | 6 +++--- Sources/Atomics/Unmanaged extensions.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Atomics/Protocols/AtomicReference.swift b/Sources/Atomics/Protocols/AtomicReference.swift index 61b4e80..3423e74 100644 --- a/Sources/Atomics/Protocols/AtomicReference.swift +++ b/Sources/Atomics/Protocols/AtomicReference.swift @@ -148,7 +148,7 @@ internal struct _AtomicReferenceStorage { @usableFromInline internal init(_ value: __owned AnyObject?) { let dword = DoubleWord( - _raw: Unmanaged.passRetained(value)?.toOpaque(), + _raw: Unmanaged._passRetained(value)?.toOpaque(), readers: 0, version: 0) _storage = Storage(dword) @@ -302,7 +302,7 @@ internal struct _AtomicReferenceStorage { _ desired: __owned AnyObject?, at pointer: UnsafeMutablePointer ) -> AnyObject? { - let new = Unmanaged.passRetained(desired) + let new = Unmanaged._passRetained(desired) var old = _startLoading(from: pointer) var (exchanged, original) = _tryExchange(old: &old, new: new, at: pointer) while !exchanged { @@ -318,7 +318,7 @@ internal struct _AtomicReferenceStorage { at pointer: UnsafeMutablePointer ) -> (exchanged: Bool, original: AnyObject?) { let expectedRaw = expected._raw - let new = Unmanaged.passRetained(desired) + let new = Unmanaged._passRetained(desired) var old = _startLoading(from: pointer) while old._raw == expectedRaw { let (exchanged, original) = _tryExchange(old: &old, new: new, at: pointer) diff --git a/Sources/Atomics/Unmanaged extensions.swift b/Sources/Atomics/Unmanaged extensions.swift index b4b1a44..67070dd 100644 --- a/Sources/Atomics/Unmanaged extensions.swift +++ b/Sources/Atomics/Unmanaged extensions.swift @@ -42,7 +42,7 @@ extension Unmanaged { extension Unmanaged { @inline(__always) - internal static func passRetained(_ instance: __owned Instance?) -> Self? { + internal static func _passRetained(_ instance: __owned Instance?) -> Self? { guard let instance = instance else { return nil } return .passRetained(instance) }