Sort DeclAttributeAndRanges Deterministically
#26099
Conversation
|
@swift-ci please test |
| }); | ||
| std::sort( | ||
| SortedRanges.begin(), SortedRanges.end(), | ||
| [&](DeclAttributeAndRange LHS, DeclAttributeAndRange RHS) { |
There was a problem hiding this comment.
Could you add a comment that the comparison is like this because ranges may overlap along with a FIXME to investigate why there are overlapped ranges in the first place ?
There was a problem hiding this comment.
I believe it's not that there are overlapping ranges, but rather when comparing something against itself. So... a very specific instance of overlapping ranges.
Given that the ranges shouldn't overlap otherwise, would it be fair to just compare the start of each range rather than both the start and end?
There was a problem hiding this comment.
I see, so a simpler return SM.isBeforeInBuffer(LHS.second.Start, RHS.second.Start); would work as well?
There was a problem hiding this comment.
Yeah, that's what I changed it to. I didn't realize before that the ranges shouldn't overlap otherwise, but that makes sense give that they're source ranges of attributes.
lib/IDE/SyntaxModel.cpp
Outdated
| [&](DeclAttributeAndRange LHS, DeclAttributeAndRange RHS) { | ||
| return SM.isBeforeInBuffer(LHS.second.Start, RHS.second.Start) | ||
| ? true | ||
| : SM.isBeforeInBuffer(RHS.second.Start, LHS.second.Start) |
There was a problem hiding this comment.
You could simply use
: LHS.second.Start != RHS.second.Start
here.
gmittert
force-pushed
the
ATrueOrdering
branch
2 times, most recently
from
b7c6b08 to
f6dae49
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
Comparing the start and end of ranges doesn't work in all cases since both a < b and b < a can be true if a = b. This behavior was causing an assertion fail in the Windows standard library which while sorting, asserts that if `a < b`, then `!(b < a)` in debug mode. Since ranges don't overlap otherwise, comparing just the starts of the ranges will properly sort them.
|
@swift-ci please test |
|
Build failed |
|
Build failed |
Comparing the start and end of ranges doesn't work in all cases since
both a < b and b < a can be true if a = b. This behavior was causing an
assertion fail in the Windows standard library which while sorting,
asserts that if
a < b, then!(b < a)in debug mode.Since ranges don't overlap otherwise, comparing just the starts of the
ranges will properly sort them.