Fix dispatch time comparisons #5078
Conversation
|
/cc @mwwa |
lilyball
force-pushed
the
dispatch_time_comparisons
branch
from
e4be9ba to
506816f
Compare
| @@ -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 { | |||
There was a problem hiding this comment.
Drive-by nit: indenting mismatch (this file uses \t).
There was a problem hiding this comment.
Oh weird, I have a Vim plugin that's supposed to auto-detect this sort of thing but apparently it doesn't work anymore >_<
|
@mwwa should review this. The Linux overlay appears to have the same issue, can you please make a PR with the same change there ? |
|
@das I already submitted swiftlang/swift-corelibs-libdispatch#182 |
lilyball
force-pushed
the
dispatch_time_comparisons
branch
from
506816f to
87bed5d
Compare
|
Is there anything blocking this from being reviewed? |
|
@swift-ci Please smoke test |
|
@kballard Thanks for bringing this up. I guess Matt just hasn't had time to review it yet. |
|
Yeah, I've been out of the country for two weeks. I'll try and get to this today/tomorrow. |
|
This looks good to me. @moiseev, can you merge? |
|
A PR with a cherrypick to the swift-3.0-branch may help push that forward. |
* [Dispatch] Don't crash when comparing DispatchWallTimes with < * [Dispatch] Make comparisons with distantFuture work as expected
|
Cherry-pick submitted as #5298. |
[swift-3.0-branch] Fix dispatch time comparisons (#5078)
This PR does two things:
<comparisons onDispatchWallTimenot crash.<comparisons againstDispatchTime.distantFutureandDispatchWallTime.distantFuturebehave as expected.Fixes half of SR-2807.