Skip to content

[stdlib] Simplify __SwiftNativeNSArrayWithContiguousStorage.count #26125

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
Jul 14, 2019
Merged

[stdlib] Simplify __SwiftNativeNSArrayWithContiguousStorage.count #26125

Show file tree
Hide file tree
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
16 changes: 0 additions & 16 deletions stdlib/public/core/ContiguousArrayBuffer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ internal final class __EmptyArrayStorage
return try body(UnsafeBufferPointer(start: nil, count: 0))
}

@nonobjc
override internal func _getNonVerbatimBridgedCount() -> Int {
return 0
}

override internal func _getNonVerbatimBridgingBuffer() -> _BridgingBuffer {
return _BridgingBuffer(0)
}
Expand Down Expand Up @@ -111,17 +106,6 @@ internal final class _ContiguousArrayStorage<
}
}

/// Returns the number of elements in the array.
///
/// - Precondition: `Element` is bridged non-verbatim.
@nonobjc
override internal func _getNonVerbatimBridgedCount() -> Int {
_internalInvariant(
!_isBridgedVerbatimToObjectiveC(Element.self),
"Verbatim bridging should be handled separately")
return countAndCapacity.count
}

/// Bridge array elements and return a new buffer that owns them.
///
/// - Precondition: `Element` is bridged non-verbatim.
Expand Down
14 changes: 1 addition & 13 deletions stdlib/public/core/SwiftNativeNSArray.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,7 @@ extension __SwiftNativeNSArrayWithContiguousStorage : _NSArrayCore {
/// bridging of array elements.
@objc
internal override var count: Int {
if let bridgedStorage = _heapBufferBridged {
return _BridgingBuffer(bridgedStorage).count
}

// Check if elements are bridged verbatim.
return _nativeStorage._withVerbatimBridgedUnsafeBuffer { $0.count }
?? _nativeStorage._getNonVerbatimBridgedCount()
return _nativeStorage.countAndCapacity.count
}
}
#else
Expand Down Expand Up @@ -294,12 +288,6 @@ internal class __ContiguousArrayStorageBase
"Concrete subclasses must implement _withVerbatimBridgedUnsafeBuffer")
}

@nonobjc
internal func _getNonVerbatimBridgedCount() -> Int {
_internalInvariantFailure(
"Concrete subclasses must implement _getNonVerbatimBridgedCount")
}

internal func _getNonVerbatimBridgingBuffer() -> _BridgingBuffer {
_internalInvariantFailure(
"Concrete subclasses must implement _getNonVerbatimBridgingBuffer")
Expand Down