Merge pull request #28829 from Catfish-Man/ducking-types-5.2

swift-ci · web-flow · commit e41ae930e199 · 2019-12-19T13:12:31.000-08:00
diff --git a/stdlib/public/core/SetBridging.swift b/stdlib/public/core/SetBridging.swift
@@ -20,7 +20,7 @@ internal func _stdlib_NSSet_allObjects(_ object: AnyObject) -> _BridgingBuffer {
   let nss = unsafeBitCast(object, to: _NSSet.self)
   let count = nss.count
   let storage = _BridgingBuffer(count)
-  nss.getObjects(storage.baseAddress, count: count)
+  nss.getObjects(storage.baseAddress)
   return storage
 }
 
diff --git a/stdlib/public/core/ShadowProtocols.swift b/stdlib/public/core/ShadowProtocols.swift
@@ -175,6 +175,10 @@ internal protocol _NSSet: _NSSetCore {
     _ buffer: UnsafeMutablePointer<AnyObject>,
     count: Int
   )
+
+  @objc(getObjects:) func getObjects(
+    _ buffer: UnsafeMutablePointer<AnyObject>
+  )
 }
 
 /// A shadow for the API of NSNumber we will use in the core

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal func _stdlib_NSSet_allObjects(_ object: AnyObject) -> _BridgingBuffer {`
`20`	`20`	`let nss = unsafeBitCast(object, to: _NSSet.self)`
`21`	`21`	`let count = nss.count`
`22`	`22`	`let storage = _BridgingBuffer(count)`
`23`		`- nss.getObjects(storage.baseAddress, count: count)`
	`23`	`+ nss.getObjects(storage.baseAddress)`
`24`	`24`	`return storage`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,10 @@ internal protocol _NSSet: _NSSetCore {`
`175`	`175`	`_ buffer: UnsafeMutablePointer<AnyObject>,`
`176`	`176`	`count: Int`
`177`	`177`	`)`
	`178`	`+`
	`179`	`+ @objc(getObjects:) func getObjects(`
	`180`	`+ _ buffer: UnsafeMutablePointer<AnyObject>`
	`181`	`+ )`
`178`	`182`	`}`
`179`	`183`
`180`	`184`	`/// A shadow for the API of NSNumber we will use in the core`