Rollup merge of #125921 - Zalathar:buckets, r=oli-obk
coverage: Carve out hole spans in a separate early pass When extracting spans from MIR for use in coverage instrumentation, we sometimes need to identify *hole spans* (currently just closures), and carve up the other spans so that they don't overlap with holes. This PR simplifies the main coverage-span-refiner by extracting the hole-carving process into a separate early pass. That pass produces a series of independent buckets, and we run the span-refiner on each bucket separately. There is almost no difference in the resulting mappings, other than in some edge cases involving macros.
This commit is contained in:
commit
79bb336b9c
6 changed files with 243 additions and 147 deletions
|
@ -682,6 +682,13 @@ impl Span {
|
|||
if span.hi > other.hi { Some(span.with_lo(cmp::max(span.lo, other.hi))) } else { None }
|
||||
}
|
||||
|
||||
/// Returns `Some(span)`, where the end is trimmed by the start of `other`.
|
||||
pub fn trim_end(self, other: Span) -> Option<Span> {
|
||||
let span = self.data();
|
||||
let other = other.data();
|
||||
if span.lo < other.lo { Some(span.with_hi(cmp::min(span.hi, other.lo))) } else { None }
|
||||
}
|
||||
|
||||
/// Returns the source span -- this is either the supplied span, or the span for
|
||||
/// the macro callsite that expanded to it.
|
||||
pub fn source_callsite(self) -> Span {
|
||||
|
|
|
@ -42,3 +42,60 @@ fn test_normalize_newlines() {
|
|||
check("\r\r\n", "\r\n", &[2]);
|
||||
check("hello\rworld", "hello\rworld", &[]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_trim() {
|
||||
let span = |lo: usize, hi: usize| {
|
||||
Span::new(BytePos::from_usize(lo), BytePos::from_usize(hi), SyntaxContext::root(), None)
|
||||
};
|
||||
|
||||
// Various positions, named for their relation to `start` and `end`.
|
||||
let well_before = 1;
|
||||
let before = 3;
|
||||
let start = 5;
|
||||
let mid = 7;
|
||||
let end = 9;
|
||||
let after = 11;
|
||||
let well_after = 13;
|
||||
|
||||
// The resulting span's context should be that of `self`, not `other`.
|
||||
let other = span(start, end).with_ctxt(SyntaxContext::from_u32(999));
|
||||
|
||||
// Test cases for `trim_end`.
|
||||
|
||||
assert_eq!(span(well_before, before).trim_end(other), Some(span(well_before, before)));
|
||||
assert_eq!(span(well_before, start).trim_end(other), Some(span(well_before, start)));
|
||||
assert_eq!(span(well_before, mid).trim_end(other), Some(span(well_before, start)));
|
||||
assert_eq!(span(well_before, end).trim_end(other), Some(span(well_before, start)));
|
||||
assert_eq!(span(well_before, after).trim_end(other), Some(span(well_before, start)));
|
||||
|
||||
assert_eq!(span(start, mid).trim_end(other), None);
|
||||
assert_eq!(span(start, end).trim_end(other), None);
|
||||
assert_eq!(span(start, after).trim_end(other), None);
|
||||
|
||||
assert_eq!(span(mid, end).trim_end(other), None);
|
||||
assert_eq!(span(mid, after).trim_end(other), None);
|
||||
|
||||
assert_eq!(span(end, after).trim_end(other), None);
|
||||
|
||||
assert_eq!(span(after, well_after).trim_end(other), None);
|
||||
|
||||
// Test cases for `trim_start`.
|
||||
|
||||
assert_eq!(span(after, well_after).trim_start(other), Some(span(after, well_after)));
|
||||
assert_eq!(span(end, well_after).trim_start(other), Some(span(end, well_after)));
|
||||
assert_eq!(span(mid, well_after).trim_start(other), Some(span(end, well_after)));
|
||||
assert_eq!(span(start, well_after).trim_start(other), Some(span(end, well_after)));
|
||||
assert_eq!(span(before, well_after).trim_start(other), Some(span(end, well_after)));
|
||||
|
||||
assert_eq!(span(mid, end).trim_start(other), None);
|
||||
assert_eq!(span(start, end).trim_start(other), None);
|
||||
assert_eq!(span(before, end).trim_start(other), None);
|
||||
|
||||
assert_eq!(span(start, mid).trim_start(other), None);
|
||||
assert_eq!(span(before, mid).trim_start(other), None);
|
||||
|
||||
assert_eq!(span(before, start).trim_start(other), None);
|
||||
|
||||
assert_eq!(span(well_before, before).trim_start(other), None);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue