mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coverage: Split span refinement into two separate steps

Browse Source
This commit is contained in:
Zalathar 2024-06-15 23:39:04 +10:00
parent 118f66c237
commit 2d3e6c8804
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/rustc_mir_transform/src/coverage/spans.rs
View File

@ -59,8 +59,15 @@ pub(super) fn extract_refined_covspans(
for mut covspans in buckets { for mut covspans in buckets {
// Make sure each individual bucket is internally sorted. // Make sure each individual bucket is internally sorted.
covspans.sort_by(compare_covspans); covspans.sort_by(compare_covspans);
let _span = debug_span!("processing bucket", ?covspans).entered();
let mut covspans = remove_unwanted_overlapping_spans(covspans);
debug!(?covspans, "after removing overlaps");
// Do one last merge pass, to simplify the output.
covspans.dedup_by(|b, a| a.merge_if_eligible(b));
debug!(?covspans, "after merge");
let covspans = refine_sorted_spans(covspans);
code_mappings.extend(covspans.into_iter().map(|Covspan { span, bcb }| { code_mappings.extend(covspans.into_iter().map(|Covspan { span, bcb }| {
// Each span produced by the refiner represents an ordinary code region. // Each span produced by the refiner represents an ordinary code region.
mappings::CodeMapping { span, bcb } mappings::CodeMapping { span, bcb }
@ -177,10 +184,11 @@ fn drain_front_while<'a, T>(
} }
/// Takes one of the buckets of (sorted) spans extracted from MIR, and "refines" /// Takes one of the buckets of (sorted) spans extracted from MIR, and "refines"
/// those spans by removing spans that overlap in unwanted ways, and by merging /// those spans by removing spans that overlap in unwanted ways.
/// compatible adjacent spans.
#[instrument(level = "debug")] #[instrument(level = "debug")]
fn refine_sorted_spans(sorted_spans: Vec<Covspan>) -> Vec<Covspan> { fn remove_unwanted_overlapping_spans(sorted_spans: Vec<Covspan>) -> Vec<Covspan> {
debug_assert!(sorted_spans.is_sorted_by(|a, b| compare_spans(a.span, b.span).is_le()));
// Holds spans that have been read from the input vector, but haven't yet // Holds spans that have been read from the input vector, but haven't yet
// been committed to the output vector. // been committed to the output vector.
let mut pending = vec![]; let mut pending = vec![];
@ -205,12 +213,6 @@ fn refine_sorted_spans(sorted_spans: Vec<Covspan>) -> Vec<Covspan> {
// Drain the rest of the pending list into the refined list. // Drain the rest of the pending list into the refined list.
refined.extend(pending); refined.extend(pending);
// Do one last merge pass, to simplify the output.
debug!(?refined, "before merge");
refined.dedup_by(|b, a| a.merge_if_eligible(b));
debug!(?refined, "after merge");
refined refined
} }