Merge pull request #3648 from mwwa/libdispatch-data-fixes

[libdispatch] libdispatch data fixes

Author: DougGregor

apinotes/Dispatch.apinotes

@@ -198,7 +198,7 @@ Functions:
   AvailabilityMsg: 'Use DispatchWorkItem.isCancelled'
 # dispatch_data
 - Name: dispatch_data_create
-  SwiftPrivate: true
+  Availability: nonswift
 - Name: dispatch_data_get_size
   SwiftPrivate: true
 - Name: dispatch_data_apply

stdlib/public/SDK/Dispatch/Data.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import SwiftShims
+
 public struct DispatchData : RandomAccessCollection, _ObjectiveCBridgeable {
 	public typealias Iterator = DispatchDataIterator
 	public typealias Index = Int
@@ -43,8 +45,8 @@ public struct DispatchData : RandomAccessCollection, _ObjectiveCBridgeable {
 	/// - parameter bytes: A pointer to the memory. It will be copied.
 	/// - parameter count: The number of bytes to copy.
 	public init(bytes buffer: UnsafeBufferPointer<UInt8>) {
-		__wrapped = __dispatch_data_create(
-			buffer.baseAddress!, buffer.count, nil, _dispatch_data_destructor_default())
+		__wrapped = _swift_dispatch_data_create(
+			buffer.baseAddress!, buffer.count, nil, _dispatch_data_destructor_default()) as! __DispatchData
 	}
 
 	/// Initialize a `Data` without copying the bytes.
@@ -55,8 +57,8 @@ public struct DispatchData : RandomAccessCollection, _ObjectiveCBridgeable {
 	public init(bytesNoCopy bytes: UnsafeBufferPointer<UInt8>, deallocator: Deallocator = .free) {
 		let (q, b) = deallocator._deallocator
 
-		__wrapped = __dispatch_data_create(
-			bytes.baseAddress!, bytes.count, q, b)
+		__wrapped = _swift_dispatch_data_create(
+			bytes.baseAddress!, bytes.count, q, b) as! __DispatchData
 	}
 
 	internal init(data: __DispatchData) {
@@ -93,15 +95,15 @@ public struct DispatchData : RandomAccessCollection, _ObjectiveCBridgeable {
 	/// - parameter bytes: A pointer to the bytes to copy in to the data.
 	/// - parameter count: The number of bytes to copy.
 	public mutating func append(_ bytes: UnsafePointer<UInt8>, count: Int) {
-		let data = __dispatch_data_create(bytes, count, nil, _dispatch_data_destructor_default())
+		let data = _swift_dispatch_data_create(bytes, count, nil, _dispatch_data_destructor_default()) as! __DispatchData
 		self.append(DispatchData(data: data))
 	}
 
 	/// Append data to the data.
 	///
 	/// - parameter data: The data to append to this data.
 	public mutating func append(_ other: DispatchData) {
-		let data = __dispatch_data_create_concat(__wrapped, other as __DispatchData)
+		let data = __dispatch_data_create_concat(__wrapped, other.__wrapped)
 		__wrapped = data
 	}
 
@@ -237,14 +239,15 @@ public struct DispatchDataIterator : IteratorProtocol, Sequence {
 		self._count = 0
 		self._data = __dispatch_data_create_map(
 			_data as __DispatchData, &ptr, &self._count)
-		self._ptr = UnsafePointer(ptr!)
+		self._ptr = UnsafePointer(ptr)
 		self._position = _data.startIndex
+
+		// The only time we expect a 'nil' pointer is when the data is empty.
+		assert(self._ptr != nil || self._count == self._position)
 	}
 
 	/// Advance to the next element and return it, or `nil` if no next
 	/// element exists.
-	///
-	/// - Precondition: No preceding call to `self.next()` has returned `nil`.
 	public mutating func next() -> DispatchData._Element? {
 		if _position == _count { return nil }
 		let element = _ptr[_position]
@@ -253,7 +256,7 @@ public struct DispatchDataIterator : IteratorProtocol, Sequence {
 	}
 
 	internal let _data: __DispatchData
-	internal var _ptr: UnsafePointer<UInt8>
+	internal var _ptr: UnsafePointer<UInt8>!
 	internal var _count: Int
 	internal var _position: DispatchData.Index
 }

stdlib/public/SwiftShims/DispatchShims.h

@@ -95,6 +95,14 @@ void _swift_dispatch_apply_current(
 		unsigned int iterations,
 		void SWIFT_DISPATCH_NOESCAPE (^block)(long));
 
+SWIFT_RUNTIME_STDLIB_INTERFACE
+__swift_shims_dispatch_data_t 
+_swift_dispatch_data_create(
+		const void *buffer,
+		__swift_size_t size,
+		__swift_shims_dispatch_queue_t queue,
+		__swift_shims_dispatch_block_t destructor);
+
 #ifdef __cplusplus
 }} // extern "C", namespace swift
 #endif

stdlib/public/stubs/DispatchShims.mm

@@ -120,3 +120,14 @@ void SWIFT_DISPATCH_NOESCAPE (^block)(long))
 		block((long)i);
 	});
 }
+
+__swift_shims_dispatch_data_t
+swift::_swift_dispatch_data_create(
+		const void *buffer,
+		__swift_size_t size,
+		__swift_shims_dispatch_queue_t queue,
+		__swift_shims_dispatch_block_t destructor)
+{
+	return dispatch_data_create(buffer, size, cast(queue), cast(destructor));
+}
+

test/1_stdlib/Dispatch.swift

@@ -61,3 +61,10 @@ if #available(OSX 10.10, iOS 8.0, *) {
     block.cancel()
   }
 }
+
+DispatchAPI.test("dispatch_data_t enumeration") {
+	// Ensure we can iterate the empty iterator
+	for x in DispatchData.empty {
+		_ = 1
+	}
+}