Skip to content

Commit 776684b

Browse files
committed
coverage: Simplify (non-closure) covspans truncating each other
1 parent b365dee commit 776684b

File tree

1 file changed

+7
-7
lines changed
  • compiler/rustc_mir_transform/src/coverage

1 file changed

+7
-7
lines changed

compiler/rustc_mir_transform/src/coverage/spans.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,13 @@ impl PrevCovspan {
132132
self.merged_spans.push(other.span);
133133
}
134134

135-
fn cutoff_statements_at(&mut self, cutoff_pos: BytePos) {
135+
fn cutoff_statements_at(mut self, cutoff_pos: BytePos) -> Option<RefinedCovspan> {
136136
self.merged_spans.retain(|span| span.hi() <= cutoff_pos);
137137
if let Some(max_hi) = self.merged_spans.iter().map(|span| span.hi()).max() {
138138
self.span = self.span.with_hi(max_hi);
139139
}
140+
141+
if self.merged_spans.is_empty() { None } else { Some(self.into_refined()) }
140142
}
141143

142144
fn refined_copy(&self) -> RefinedCovspan {
@@ -372,13 +374,11 @@ impl SpansRefiner {
372374
);
373375

374376
let curr_span = self.curr().span;
375-
self.prev_mut().cutoff_statements_at(curr_span.lo());
376-
if self.prev().merged_spans.is_empty() {
377-
debug!(" ... no non-overlapping statements to add");
378-
} else {
379-
debug!(" ... adding modified prev={:?}", self.prev());
380-
let prev = self.take_prev().into_refined();
377+
if let Some(prev) = self.take_prev().cutoff_statements_at(curr_span.lo()) {
378+
debug!("after cutoff, adding {prev:?}");
381379
self.refined_spans.push(prev);
380+
} else {
381+
debug!("prev was eliminated by cutoff");
382382
}
383383
}
384384
}

0 commit comments

Comments
 (0)