Skip to content

[6.0][cxx-interop] Back out ~Copyable changes for now #72539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2024
Merged

[6.0][cxx-interop] Back out ~Copyable changes for now #72539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions stdlib/public/Cxx/UnsafeCxxIterators.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
///
/// - SeeAlso: https://en.cppreference.com/w/cpp/named_req/InputIterator
public protocol UnsafeCxxInputIterator: Equatable {
associatedtype Pointee: ~Copyable
associatedtype Pointee

/// Returns the unwrapped result of C++ `operator*()`.
///
Expand All @@ -34,23 +34,19 @@ public protocol UnsafeCxxInputIterator: Equatable {
func successor() -> Self
}

extension UnsafePointer: UnsafeCxxInputIterator
where Pointee: ~Copyable {}
extension UnsafePointer: UnsafeCxxInputIterator {}

extension UnsafeMutablePointer: UnsafeCxxInputIterator
where Pointee: ~Copyable {}
extension UnsafeMutablePointer: UnsafeCxxInputIterator {}

extension Optional: UnsafeCxxInputIterator where Wrapped: UnsafeCxxInputIterator {
public typealias Pointee = Wrapped.Pointee

@inlinable
public var pointee: Pointee {
_read {
guard let value = self else {
fatalError("Could not dereference nullptr")
}
yield value.pointee
if let value = self {
return value.pointee
}
fatalError("Could not dereference nullptr")
}

@inlinable
Expand All @@ -67,8 +63,7 @@ public protocol UnsafeCxxMutableInputIterator: UnsafeCxxInputIterator {
override var pointee: Pointee { get set }
}

extension UnsafeMutablePointer: UnsafeCxxMutableInputIterator
where Pointee: ~Copyable {}
extension UnsafeMutablePointer: UnsafeCxxMutableInputIterator {}

/// Bridged C++ iterator that allows computing the distance between two of its
/// instances, and advancing an instance by a given number of elements.
Expand All @@ -84,14 +79,11 @@ public protocol UnsafeCxxRandomAccessIterator: UnsafeCxxInputIterator {
static func +=(lhs: inout Self, rhs: Distance)
}

extension UnsafePointer: UnsafeCxxRandomAccessIterator
where Pointee: ~Copyable {}
extension UnsafePointer: UnsafeCxxRandomAccessIterator {}

extension UnsafeMutablePointer: UnsafeCxxRandomAccessIterator
where Pointee: ~Copyable {}
extension UnsafeMutablePointer: UnsafeCxxRandomAccessIterator {}

public protocol UnsafeCxxMutableRandomAccessIterator:
UnsafeCxxRandomAccessIterator, UnsafeCxxMutableInputIterator {}

extension UnsafeMutablePointer: UnsafeCxxMutableRandomAccessIterator
where Pointee: ~Copyable {}
extension UnsafeMutablePointer: UnsafeCxxMutableRandomAccessIterator {}