Skip to content

Commit 2d3e6c8

Browse files
committed
coverage: Split span refinement into two separate steps
1 parent 118f66c commit 2d3e6c8

File tree

1 file changed

+12
-10
lines changed
  • compiler/rustc_mir_transform/src/coverage

1 file changed

+12
-10
lines changed

compiler/rustc_mir_transform/src/coverage/spans.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,15 @@ pub(super) fn extract_refined_covspans(
5959
for mut covspans in buckets {
6060
// Make sure each individual bucket is internally sorted.
6161
covspans.sort_by(compare_covspans);
62+
let _span = debug_span!("processing bucket", ?covspans).entered();
63+
64+
let mut covspans = remove_unwanted_overlapping_spans(covspans);
65+
debug!(?covspans, "after removing overlaps");
66+
67+
// Do one last merge pass, to simplify the output.
68+
covspans.dedup_by(|b, a| a.merge_if_eligible(b));
69+
debug!(?covspans, "after merge");
6270

63-
let covspans = refine_sorted_spans(covspans);
6471
code_mappings.extend(covspans.into_iter().map(|Covspan { span, bcb }| {
6572
// Each span produced by the refiner represents an ordinary code region.
6673
mappings::CodeMapping { span, bcb }
@@ -177,10 +184,11 @@ fn drain_front_while<'a, T>(
177184
}
178185

179186
/// Takes one of the buckets of (sorted) spans extracted from MIR, and "refines"
180-
/// those spans by removing spans that overlap in unwanted ways, and by merging
181-
/// compatible adjacent spans.
187+
/// those spans by removing spans that overlap in unwanted ways.
182188
#[instrument(level = "debug")]
183-
fn refine_sorted_spans(sorted_spans: Vec<Covspan>) -> Vec<Covspan> {
189+
fn remove_unwanted_overlapping_spans(sorted_spans: Vec<Covspan>) -> Vec<Covspan> {
190+
debug_assert!(sorted_spans.is_sorted_by(|a, b| compare_spans(a.span, b.span).is_le()));
191+
184192
// Holds spans that have been read from the input vector, but haven't yet
185193
// been committed to the output vector.
186194
let mut pending = vec![];
@@ -205,12 +213,6 @@ fn refine_sorted_spans(sorted_spans: Vec<Covspan>) -> Vec<Covspan> {
205213

206214
// Drain the rest of the pending list into the refined list.
207215
refined.extend(pending);
208-
209-
// Do one last merge pass, to simplify the output.
210-
debug!(?refined, "before merge");
211-
refined.dedup_by(|b, a| a.merge_if_eligible(b));
212-
debug!(?refined, "after merge");
213-
214216
refined
215217
}
216218

0 commit comments

Comments
 (0)