Merge pull request #5298 from kballard/swift_3_dispatch_time_comparisons

[swift-3.0-branch] Fix dispatch time comparisons (#5078)

Author: airspeedswift

stdlib/public/SDK/Dispatch/Time.swift

@@ -45,7 +45,6 @@ public struct DispatchTime : Comparable {
 }
 
 public func <(a: DispatchTime, b: DispatchTime) -> Bool {
-	if a.rawValue == ~0 || b.rawValue == ~0 { return false }
 	return a.rawValue < b.rawValue
 }
 
@@ -73,8 +72,12 @@ public struct DispatchWallTime : Comparable {
 }
 
 public func <(a: DispatchWallTime, b: DispatchWallTime) -> Bool {
-	if a.rawValue == ~0 || b.rawValue == ~0 { return false }
-	return -Int64(a.rawValue) < -Int64(b.rawValue)
+	if b.rawValue == ~0 {
+		return a.rawValue != ~0
+	} else if a.rawValue == ~0 {
+		return false
+	}
+	return -Int64(bitPattern: a.rawValue) < -Int64(bitPattern: b.rawValue)
 }
 
 public func ==(a: DispatchWallTime, b: DispatchWallTime) -> Bool {

test/1_stdlib/Dispatch.swift

@@ -85,3 +85,19 @@ DispatchAPI.test("dispatch_data_t deallocator") {
 		expectEqual(1, t)
 	}
 }
+
+DispatchAPI.test("DispatchTime comparisons") {
+    do {
+        let now = DispatchTime.now()
+        checkComparable([now, now + .milliseconds(1), .distantFuture], oracle: {
+            return $0 < $1 ? .lt : $0 == $1 ? .eq : .gt
+        })
+    }
+
+    do {
+        let now = DispatchWallTime.now()
+        checkComparable([now, now + .milliseconds(1), .distantFuture], oracle: {
+            return $0 < $1 ? .lt : $0 == $1 ? .eq : .gt
+        })
+    }
+}