remove HAVE_MACH guards around munmap destructor code and add missing block declaration

Author: dgrove-oss

src/data.c

@@ -108,6 +108,10 @@ const dispatch_block_t _dispatch_data_destructor_none = ^{
 	DISPATCH_INTERNAL_CRASH(0, "none destructor called");
 };
 
+const dispatch_block_t _dispatch_data_destructor_munmap = ^{
+	DISPATCH_INTERNAL_CRASH(0, "munmap destructor called");
+};
+
 const dispatch_block_t _dispatch_data_destructor_vm_deallocate = ^{
 	DISPATCH_INTERNAL_CRASH(0, "vmdeallocate destructor called");
 };

src/swift/Data.swift

@@ -24,27 +24,18 @@ public struct DispatchData : RandomAccessCollection {
 		/// Use `free`
 		case free
 
-#if HAVE_MACH
 		/// Use `munmap`
 		case unmap
-#endif
 
 		/// A custom deallocator
 		case custom(DispatchQueue?, @convention(block) () -> Void)
 
 		private var _deallocator: (DispatchQueue?, @convention(block) () -> Void) {
-#if HAVE_MACH
 			switch self {
 			case .free: return (nil, _dispatch_data_destructor_free())
 			case .unmap: return (nil, _dispatch_data_destructor_munmap())
 			case .custom(let q, let b): return (q, b)
 			}
-#else
-			switch self {
-			case .free: return (nil, _dispatch_data_destructor_free())
-			case .custom(let q, let b): return (q, b)
-			}
-#endif
 		}
 	}
 #endif
@@ -279,10 +270,8 @@ internal func _swift_dispatch_data_empty() -> dispatch_data_t
 @_silgen_name("_swift_dispatch_data_destructor_free")
 internal func _dispatch_data_destructor_free() -> _DispatchBlock
 
-#if HAVE_MACH
 @_silgen_name("_swift_dispatch_data_destructor_munmap")
 internal func _dispatch_data_destructor_munmap() -> _DispatchBlock
-#endif
 
 @_silgen_name("_swift_dispatch_data_destructor_default")
 internal func _dispatch_data_destructor_default() -> _DispatchBlock

src/swift/DispatchStubs.cc

@@ -93,13 +93,11 @@ _swift_dispatch_data_destructor_free(void) {
   return _dispatch_data_destructor_free;
 }
 
-#if HAVE_MACH
 SWIFT_CC(swift) DISPATCH_RUNTIME_STDLIB_INTERFACE
 extern "C" dispatch_block_t
 _swift_dispatch_data_destructor_munmap(void) {
   return _dispatch_data_destructor_munmap;
 }
-#endif
 
 SWIFT_CC(swift) DISPATCH_RUNTIME_STDLIB_INTERFACE
 extern "C" dispatch_block_t