Skip to content

Commit ff882f4

Browse files
committed
[stdlib] Set, Dictionary: Sanitize @objc-ness for NSEnumerator members
1 parent 430a9f3 commit ff882f4

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

stdlib/public/core/Dictionary.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2743,11 +2743,12 @@ extension _NativeDictionary { // High-level operations
27432743
final internal class _SwiftDictionaryNSEnumerator<Key: Hashable, Value>
27442744
: _SwiftNativeNSEnumerator, _NSEnumerator {
27452745

2746-
internal var base: _NativeDictionary<Key, Value>
2747-
internal var bridgedKeys: _BridgingHashBuffer?
2748-
internal var nextIndex: _NativeDictionary<Key, Value>.Index
2749-
internal var endIndex: _NativeDictionary<Key, Value>.Index
2746+
@nonobjc internal var base: _NativeDictionary<Key, Value>
2747+
@nonobjc internal var bridgedKeys: _BridgingHashBuffer?
2748+
@nonobjc internal var nextIndex: _NativeDictionary<Key, Value>.Index
2749+
@nonobjc internal var endIndex: _NativeDictionary<Key, Value>.Index
27502750

2751+
@objc
27512752
internal override required init() {
27522753
_sanityCheckFailure("don't call this designated initializer")
27532754
}
@@ -2760,6 +2761,7 @@ final internal class _SwiftDictionaryNSEnumerator<Key: Hashable, Value>
27602761
self.endIndex = base.endIndex
27612762
}
27622763

2764+
@nonobjc
27632765
internal init(_ deferred: _SwiftDeferredNSDictionary<Key, Value>) {
27642766
_sanityCheck(!_isBridgedVerbatimToObjectiveC(Key.self))
27652767
self.base = deferred.native

stdlib/public/core/Set.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,11 +2130,12 @@ extension _NativeSet { // Deletion
21302130
final internal class _SwiftSetNSEnumerator<Element: Hashable>
21312131
: _SwiftNativeNSEnumerator, _NSEnumerator {
21322132

2133-
internal var base: _NativeSet<Element>
2134-
internal var bridgedElements: _BridgingHashBuffer?
2135-
internal var nextIndex: _NativeSet<Element>.Index
2136-
internal var endIndex: _NativeSet<Element>.Index
2133+
@nonobjc internal var base: _NativeSet<Element>
2134+
@nonobjc internal var bridgedElements: _BridgingHashBuffer?
2135+
@nonobjc internal var nextIndex: _NativeSet<Element>.Index
2136+
@nonobjc internal var endIndex: _NativeSet<Element>.Index
21372137

2138+
@objc
21382139
internal override required init() {
21392140
_sanityCheckFailure("don't call this designated initializer")
21402141
}
@@ -2147,6 +2148,7 @@ final internal class _SwiftSetNSEnumerator<Element: Hashable>
21472148
self.endIndex = base.endIndex
21482149
}
21492150

2151+
@nonobjc
21502152
internal init(_ deferred: _SwiftDeferredNSSet<Element>) {
21512153
_sanityCheck(!_isBridgedVerbatimToObjectiveC(Element.self))
21522154
self.base = deferred.native

0 commit comments

Comments
 (0)