[libdispatch] fixup tests for new syntax

    * Several swift tests rely on old libdispatch syntax. This change
    adopts the new syntax throughout the swift tests.

Author: mwwa

test/1_stdlib/Dispatch.swift

@@ -18,7 +18,7 @@ DispatchAPI.test("constants") {
 
   // This is a lousy test, but really we just care that
   // DISPATCH_QUEUE_CONCURRENT comes through at all.
-  _ = DispatchQueueAttributes.concurrent
+  _ = DispatchQueue.Attributes.concurrent
 }
 
 DispatchAPI.test("OS_OBJECT support") {
@@ -56,7 +56,7 @@ if #available(OSX 10.10, iOS 8.0, *) {
       _ = 1
     }
 
-    DispatchQueue.main.asynchronously(execute: block)
+    DispatchQueue.main.async(execute: block)
     // This will trap if the block's pointer identity is not preserved.
     block.cancel()
   }

test/1_stdlib/DispatchTypes.swift

@@ -9,30 +9,30 @@ func getAnyValue<T>(_ opt: T?) -> T { return opt! }
 // dispatch/io.h
 let io = DispatchIO(type: .stream, fileDescriptor: 0, queue: DispatchQueue.main, cleanupHandler: { (error: Int32) -> () in fatalError() })
 io.close(flags: .stop)
-io.setInterval(interval: 0, flags: .strictInterval)
+io.setInterval(interval: .seconds(0), flags: .strictInterval)
 
 // dispatch/queue.h
-let q = DispatchQueue(label: "", attributes: .serial)
+let q = DispatchQueue(label: "", attributes: [])
 _ = DispatchQueue(label: "", attributes: .concurrent)
 _ = q.label
 if #available(OSX 10.10, iOS 8.0, *) {
-	_ = DispatchQueue.global(attributes: .qosUserInteractive)
-	_ = DispatchQueue.global(attributes: .qosBackground)
-	_ = DispatchQueue.global(attributes: .qosDefault)	
+	_ = DispatchQueue.global(qos: .userInteractive)
+	_ = DispatchQueue.global(qos: .background)
+	_ = DispatchQueue.global(qos: .default)	
 }
 
 // dispatch/source.h
-_ = DispatchSource.userDataAdd()
-_ = DispatchSource.userDataOr()
-_ = DispatchSource.machSend(port: mach_port_t(0), eventMask: [])
-_ = DispatchSource.machReceive(port: mach_port_t(0))
-_ = DispatchSource.memoryPressure(eventMask: [])
-_ = DispatchSource.process(identifier: 0, eventMask: [])
-_ = DispatchSource.read(fileDescriptor: 0)
-_ = DispatchSource.signal(signal: SIGINT)
-_ = DispatchSource.timer()
-_ = DispatchSource.fileSystemObject(fileDescriptor: 0, eventMask: [])
-_ = DispatchSource.write(fileDescriptor: 0)
+_ = DispatchSource.makeUserDataAddSource()
+_ = DispatchSource.makeUserDataOrSource()
+_ = DispatchSource.makeMachSendSource(port: mach_port_t(0), eventMask: [])
+_ = DispatchSource.makeMachReceiveSource(port: mach_port_t(0))
+_ = DispatchSource.makeMemoryPressureSource(eventMask: [])
+_ = DispatchSource.makeProcessSource(identifier: 0, eventMask: [])
+_ = DispatchSource.makeReadSource(fileDescriptor: 0)
+_ = DispatchSource.makeSignalSource(signal: SIGINT)
+_ = DispatchSource.makeTimerSource()
+_ = DispatchSource.makeFileSystemObjectSource(fileDescriptor: 0, eventMask: [])
+_ = DispatchSource.makeWriteSource(fileDescriptor: 0)
 
 // dispatch/time.h
 _ = DispatchTime.now()

test/1_stdlib/NoFoundation.swift

@@ -35,5 +35,5 @@ _ = no as No
 
 import Dispatch
 if #available(OSX 10.10, iOS 8.0, *) {
-	print(DispatchQueue.global(attributes: .qosDefault))
+	print(DispatchQueue.global(qos: .default))
 }

test/Prototypes/CollectionTransformers.swift

@@ -425,11 +425,11 @@ final class _ForkJoinWorkerThread {
   internal func startAsync() {
     var queue: DispatchQueue? = nil
     if #available(OSX 10.10, iOS 8.0, *) {
-      queue = DispatchQueue.global(attributes: .qosBackground)
+      queue = DispatchQueue.global(qos: .background)
     } else {
-      queue = DispatchQueue.global(attributes: .priorityBackground)
+      queue = DispatchQueue.global(priority: .background)
     }
-    queue!.asynchronously {
+    queue!.async {
       self._thread()
     }
   }

test/Runtime/weak-reference-racetests-dispatch.swift

@@ -38,11 +38,11 @@ WeakReferenceRaceTests.test("class instance property [SR-192] (copy)") {
       _blackHole(nbox)
     }
 
-    q.asynchronously(execute: closure)
-    q.asynchronously(execute: closure)
+    q.async(execute: closure)
+    q.async(execute: closure)
   }
 
-  q.asynchronously(flags: .barrier) {}
+  q.async(flags: .barrier) {}
 }
 
 WeakReferenceRaceTests.test("class instance property [SR-192] (load)") {
@@ -58,11 +58,11 @@ WeakReferenceRaceTests.test("class instance property [SR-192] (load)") {
       }
     }
 
-    q.asynchronously(execute: closure)
-    q.asynchronously(execute: closure)
+    q.async(execute: closure)
+    q.async(execute: closure)
   }
 
-  q.asynchronously(flags: .barrier) {}
+  q.async(flags: .barrier) {}
 }
 
 WeakReferenceRaceTests.test("direct capture (copy)") {
@@ -77,11 +77,11 @@ WeakReferenceRaceTests.test("direct capture (copy)") {
       _blackHole(nbox)
     }
 
-    q.asynchronously(execute: closure)
-    q.asynchronously(execute: closure)
+    q.async(execute: closure)
+    q.async(execute: closure)
   }
 
-  q.asynchronously(flags: .barrier) {}
+  q.async(flags: .barrier) {}
 }
 
 WeakReferenceRaceTests.test("direct capture (load)") {
@@ -96,11 +96,11 @@ WeakReferenceRaceTests.test("direct capture (load)") {
       }
     }
 
-    q.asynchronously(execute: closure)
-    q.asynchronously(execute: closure)
+    q.async(execute: closure)
+    q.async(execute: closure)
   }
 
-  q.asynchronously(flags: .barrier) {}
+  q.async(flags: .barrier) {}
 }
 
 runAllTests()

test/SILGen/lit.local.cfg

@@ -3,4 +3,5 @@ config.substitutions = list(config.substitutions)
 
 config.substitutions.insert(0, ('%build-silgen-test-overlays',
   '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/ObjectiveC.swift && '
+  '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/Dispatch.swift && '
   '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/Foundation.swift'))