diff --git a/compiler/rustc_mir_transform/src/coverage/spans.rs b/compiler/rustc_mir_transform/src/coverage/spans.rs
index f2f76ac70c20d..743f1cc24beee 100644
--- a/compiler/rustc_mir_transform/src/coverage/spans.rs
+++ b/compiler/rustc_mir_transform/src/coverage/spans.rs
@@ -20,37 +20,31 @@ pub(super) fn extract_refined_covspans(
basic_coverage_blocks: &CoverageGraph,
code_mappings: &mut impl Extend<mappings::CodeMapping>,
) {
- let sorted_spans =
+ let sorted_span_buckets =
from_mir::mir_to_initial_sorted_coverage_spans(mir_body, hir_info, basic_coverage_blocks);
- let coverage_spans = SpansRefiner::refine_sorted_spans(sorted_spans);
- code_mappings.extend(coverage_spans.into_iter().map(|RefinedCovspan { bcb, span, .. }| {
- // Each span produced by the generator represents an ordinary code region.
- mappings::CodeMapping { span, bcb }
- }));
+ for bucket in sorted_span_buckets {
+ let refined_spans = SpansRefiner::refine_sorted_spans(bucket);
+ code_mappings.extend(refined_spans.into_iter().map(|RefinedCovspan { span, bcb }| {
+ // Each span produced by the refiner represents an ordinary code region.
+ mappings::CodeMapping { span, bcb }
+ }));
+ }
}
#[derive(Debug)]
struct CurrCovspan {
span: Span,
bcb: BasicCoverageBlock,
- is_hole: bool,
}
impl CurrCovspan {
- fn new(span: Span, bcb: BasicCoverageBlock, is_hole: bool) -> Self {
- Self { span, bcb, is_hole }
+ fn new(span: Span, bcb: BasicCoverageBlock) -> Self {
+ Self { span, bcb }
}
fn into_prev(self) -> PrevCovspan {
- let Self { span, bcb, is_hole } = self;
- PrevCovspan { span, bcb, merged_spans: vec![span], is_hole }
- }
-
- fn into_refined(self) -> RefinedCovspan {
- // This is only called in cases where `curr` is a hole span that has
- // been carved out of `prev`.
- debug_assert!(self.is_hole);
- self.into_prev().into_refined()
+ let Self { span, bcb } = self;
+ PrevCovspan { span, bcb, merged_spans: vec![span] }
}
}
@@ -61,12 +55,11 @@ struct PrevCovspan {
/// List of all the original spans from MIR that have been merged into this
/// span. Mainly used to precisely skip over gaps when truncating a span.
merged_spans: Vec<Span>,
- is_hole: bool,
}
impl PrevCovspan {
fn is_mergeable(&self, other: &CurrCovspan) -> bool {
- self.bcb == other.bcb && !self.is_hole && !other.is_hole
+ self.bcb == other.bcb
}
fn merge_from(&mut self, other: &CurrCovspan) {
@@ -84,14 +77,9 @@ impl PrevCovspan {
if self.merged_spans.is_empty() { None } else { Some(self.into_refined()) }
}
- fn refined_copy(&self) -> RefinedCovspan {
- let &Self { span, bcb, merged_spans: _, is_hole } = self;
- RefinedCovspan { span, bcb, is_hole }
- }
-
fn into_refined(self) -> RefinedCovspan {
- // Even though we consume self, we can just reuse the copying impl.
- self.refined_copy()
+ let Self { span, bcb, merged_spans: _ } = self;
+ RefinedCovspan { span, bcb }
}
}
@@ -99,12 +87,11 @@ impl PrevCovspan {
struct RefinedCovspan {
span: Span,
bcb: BasicCoverageBlock,
- is_hole: bool,
}
impl RefinedCovspan {
fn is_mergeable(&self, other: &Self) -> bool {
- self.bcb == other.bcb && !self.is_hole && !other.is_hole
+ self.bcb == other.bcb
}
fn merge_from(&mut self, other: &Self) {
@@ -119,8 +106,6 @@ impl RefinedCovspan {
/// * Remove duplicate source code coverage regions
/// * Merge spans that represent continuous (both in source code and control flow), non-branching
/// execution
-/// * Carve out (leave uncovered) any "hole" spans that need to be left blank
-/// (e.g. closures that will be counted by their own MIR body)
struct SpansRefiner {
/// The initial set of coverage spans, sorted by `Span` (`lo` and `hi`) and by relative
/// dominance between the `BasicCoverageBlock`s of equal `Span`s.
@@ -181,13 +166,6 @@ impl SpansRefiner {
);
let prev = self.take_prev().into_refined();
self.refined_spans.push(prev);
- } else if prev.is_hole {
- // drop any equal or overlapping span (`curr`) and keep `prev` to test again in the
- // next iter
- debug!(?prev, "prev (a hole) overlaps curr, so discarding curr");
- self.take_curr(); // Discards curr.
- } else if curr.is_hole {
- self.carve_out_span_for_hole();
} else {
self.cutoff_prev_at_overlapping_curr();
}
@@ -211,9 +189,6 @@ impl SpansRefiner {
}
});
- // Discard hole spans, since their purpose was to carve out chunks from
- // other spans, but we don't want the holes themselves in the final mappings.
- self.refined_spans.retain(|covspan| !covspan.is_hole);
self.refined_spans
}
@@ -249,50 +224,17 @@ impl SpansRefiner {
if let Some(curr) = self.some_curr.take() {
self.some_prev = Some(curr.into_prev());
}
- while let Some(curr) = self.sorted_spans_iter.next() {
- debug!("FOR curr={:?}", curr);
- if let Some(prev) = &self.some_prev
- && prev.span.lo() > curr.span.lo()
- {
- // Skip curr because prev has already advanced beyond the end of curr.
- // This can only happen if a prior iteration updated `prev` to skip past
- // a region of code, such as skipping past a hole.
- debug!(?prev, "prev.span starts after curr.span, so curr will be dropped");
- } else {
- self.some_curr = Some(CurrCovspan::new(curr.span, curr.bcb, curr.is_hole));
- return true;
+ if let Some(SpanFromMir { span, bcb, .. }) = self.sorted_spans_iter.next() {
+ // This code only sees sorted spans after hole-carving, so there should
+ // be no way for `curr` to start before `prev`.
+ if let Some(prev) = &self.some_prev {
+ debug_assert!(prev.span.lo() <= span.lo());
}
- }
- false
- }
-
- /// If `prev`s span extends left of the hole (`curr`), carve out the hole's span from
- /// `prev`'s span. Add the portion of the span to the left of the hole; and if the span
- /// extends to the right of the hole, update `prev` to that portion of the span.
- fn carve_out_span_for_hole(&mut self) {
- let prev = self.prev();
- let curr = self.curr();
-
- let left_cutoff = curr.span.lo();
- let right_cutoff = curr.span.hi();
- let has_pre_hole_span = prev.span.lo() < right_cutoff;
- let has_post_hole_span = prev.span.hi() > right_cutoff;
-
- if has_pre_hole_span {
- let mut pre_hole = prev.refined_copy();
- pre_hole.span = pre_hole.span.with_hi(left_cutoff);
- debug!(?pre_hole, "prev overlaps a hole; adding pre-hole span");
- self.refined_spans.push(pre_hole);
- }
-
- if has_post_hole_span {
- // Mutate `prev.span` to start after the hole (and discard curr).
- self.prev_mut().span = self.prev().span.with_lo(right_cutoff);
- debug!(prev=?self.prev(), "mutated prev to start after the hole");
-
- // Prevent this curr from becoming prev.
- let hole_covspan = self.take_curr().into_refined();
- self.refined_spans.push(hole_covspan); // since self.prev() was already updated
+ self.some_curr = Some(CurrCovspan::new(span, bcb));
+ debug!(?self.some_prev, ?self.some_curr, "next_coverage_span");
+ true
+ } else {
+ false
}
}
diff --git a/compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs b/compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs
index d1727a94a35e3..b1f71035ddede 100644
--- a/compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs
+++ b/compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs
@@ -1,3 +1,5 @@
+use std::collections::VecDeque;
+
use rustc_data_structures::captures::Captures;
use rustc_data_structures::fx::FxHashSet;
use rustc_middle::bug;
@@ -17,23 +19,34 @@ use crate::coverage::ExtractedHirInfo;
/// spans, each associated with a node in the coverage graph (BCB) and possibly
/// other metadata.
///
-/// The returned spans are sorted in a specific order that is expected by the
-/// subsequent span-refinement step.
+/// The returned spans are divided into one or more buckets, such that:
+/// - The spans in each bucket are strictly after all spans in previous buckets,
+/// and strictly before all spans in subsequent buckets.
+/// - The contents of each bucket are also sorted, in a specific order that is
+/// expected by the subsequent span-refinement step.
pub(super) fn mir_to_initial_sorted_coverage_spans(
mir_body: &mir::Body<'_>,
hir_info: &ExtractedHirInfo,
basic_coverage_blocks: &CoverageGraph,
-) -> Vec<SpanFromMir> {
+) -> Vec<Vec<SpanFromMir>> {
let &ExtractedHirInfo { body_span, .. } = hir_info;
let mut initial_spans = vec![];
+ let mut holes = vec![];
for (bcb, bcb_data) in basic_coverage_blocks.iter_enumerated() {
- initial_spans.extend(bcb_to_initial_coverage_spans(mir_body, body_span, bcb, bcb_data));
+ bcb_to_initial_coverage_spans(
+ mir_body,
+ body_span,
+ bcb,
+ bcb_data,
+ &mut initial_spans,
+ &mut holes,
+ );
}
// Only add the signature span if we found at least one span in the body.
- if !initial_spans.is_empty() {
+ if !initial_spans.is_empty() || !holes.is_empty() {
// If there is no usable signature span, add a fake one (before refinement)
// to avoid an ugly gap between the body start and the first real span.
// FIXME: Find a more principled way to solve this problem.
@@ -45,29 +58,82 @@ pub(super) fn mir_to_initial_sorted_coverage_spans(
remove_unwanted_macro_spans(&mut initial_spans);
split_visible_macro_spans(&mut initial_spans);
- initial_spans.sort_by(|a, b| {
- // First sort by span start.
- Ord::cmp(&a.span.lo(), &b.span.lo())
- // If span starts are the same, sort by span end in reverse order.
- // This ensures that if spans A and B are adjacent in the list,
- // and they overlap but are not equal, then either:
- // - Span A extends further left, or
- // - Both have the same start and span A extends further right
- .then_with(|| Ord::cmp(&a.span.hi(), &b.span.hi()).reverse())
- // If two spans have the same lo & hi, put hole spans first,
- // as they take precedence over non-hole spans.
- .then_with(|| Ord::cmp(&a.is_hole, &b.is_hole).reverse())
+ let compare_covspans = |a: &SpanFromMir, b: &SpanFromMir| {
+ compare_spans(a.span, b.span)
// After deduplication, we want to keep only the most-dominated BCB.
.then_with(|| basic_coverage_blocks.cmp_in_dominator_order(a.bcb, b.bcb).reverse())
- });
+ };
+ initial_spans.sort_by(compare_covspans);
- // Among covspans with the same span, keep only one. Hole spans take
- // precedence, otherwise keep the one with the most-dominated BCB.
+ // Among covspans with the same span, keep only one,
+ // preferring the one with the most-dominated BCB.
// (Ideally we should try to preserve _all_ non-dominating BCBs, but that
// requires a lot more complexity in the span refiner, for little benefit.)
initial_spans.dedup_by(|b, a| a.span.source_equal(b.span));
- initial_spans
+ // Sort the holes, and merge overlapping/adjacent holes.
+ holes.sort_by(|a, b| compare_spans(a.span, b.span));
+ holes.dedup_by(|b, a| a.merge_if_overlapping_or_adjacent(b));
+
+ // Now we're ready to start carving holes out of the initial coverage spans,
+ // and grouping them in buckets separated by the holes.
+
+ let mut initial_spans = VecDeque::from(initial_spans);
+ let mut fragments: Vec<SpanFromMir> = vec![];
+
+ // For each hole:
+ // - Identify the spans that are entirely or partly before the hole.
+ // - Put those spans in a corresponding bucket, truncated to the start of the hole.
+ // - If one of those spans also extends after the hole, put the rest of it
+ // in a "fragments" vector that is processed by the next hole.
+ let mut buckets = (0..holes.len()).map(|_| vec![]).collect::<Vec<_>>();
+ for (hole, bucket) in holes.iter().zip(&mut buckets) {
+ let fragments_from_prev = std::mem::take(&mut fragments);
+
+ // Only inspect spans that precede or overlap this hole,
+ // leaving the rest to be inspected by later holes.
+ // (This relies on the spans and holes both being sorted.)
+ let relevant_initial_spans =
+ drain_front_while(&mut initial_spans, |c| c.span.lo() < hole.span.hi());
+
+ for covspan in fragments_from_prev.into_iter().chain(relevant_initial_spans) {
+ let (before, after) = covspan.split_around_hole_span(hole.span);
+ bucket.extend(before);
+ fragments.extend(after);
+ }
+ }
+
+ // After finding the spans before each hole, any remaining fragments/spans
+ // form their own final bucket, after the final hole.
+ // (If there were no holes, this will just be all of the initial spans.)
+ fragments.extend(initial_spans);
+ buckets.push(fragments);
+
+ // Make sure each individual bucket is still internally sorted.
+ for bucket in &mut buckets {
+ bucket.sort_by(compare_covspans);
+ }
+ buckets
+}
+
+fn compare_spans(a: Span, b: Span) -> std::cmp::Ordering {
+ // First sort by span start.
+ Ord::cmp(&a.lo(), &b.lo())
+ // If span starts are the same, sort by span end in reverse order.
+ // This ensures that if spans A and B are adjacent in the list,
+ // and they overlap but are not equal, then either:
+ // - Span A extends further left, or
+ // - Both have the same start and span A extends further right
+ .then_with(|| Ord::cmp(&a.hi(), &b.hi()).reverse())
+}
+
+/// Similar to `.drain(..)`, but stops just before it would remove an item not
+/// satisfying the predicate.
+fn drain_front_while<'a, T>(
+ queue: &'a mut VecDeque<T>,
+ mut pred_fn: impl FnMut(&T) -> bool,
+) -> impl Iterator<Item = T> + Captures<'a> {
+ std::iter::from_fn(move || if pred_fn(queue.front()?) { queue.pop_front() } else { None })
}
/// Macros that expand into branches (e.g. `assert!`, `trace!`) tend to generate
@@ -80,8 +146,8 @@ pub(super) fn mir_to_initial_sorted_coverage_spans(
fn remove_unwanted_macro_spans(initial_spans: &mut Vec<SpanFromMir>) {
let mut seen_macro_spans = FxHashSet::default();
initial_spans.retain(|covspan| {
- // Ignore (retain) hole spans and non-macro-expansion spans.
- if covspan.is_hole || covspan.visible_macro.is_none() {
+ // Ignore (retain) non-macro-expansion spans.
+ if covspan.visible_macro.is_none() {
return true;
}
@@ -98,10 +164,6 @@ fn split_visible_macro_spans(initial_spans: &mut Vec<SpanFromMir>) {
let mut extra_spans = vec![];
initial_spans.retain(|covspan| {
- if covspan.is_hole {
- return true;
- }
-
let Some(visible_macro) = covspan.visible_macro else { return true };
let split_len = visible_macro.as_str().len() as u32 + 1;
@@ -114,9 +176,8 @@ fn split_visible_macro_spans(initial_spans: &mut Vec<SpanFromMir>) {
return true;
}
- assert!(!covspan.is_hole);
- extra_spans.push(SpanFromMir::new(before, covspan.visible_macro, covspan.bcb, false));
- extra_spans.push(SpanFromMir::new(after, covspan.visible_macro, covspan.bcb, false));
+ extra_spans.push(SpanFromMir::new(before, covspan.visible_macro, covspan.bcb));
+ extra_spans.push(SpanFromMir::new(after, covspan.visible_macro, covspan.bcb));
false // Discard the original covspan that we just split.
});
@@ -135,8 +196,10 @@ fn bcb_to_initial_coverage_spans<'a, 'tcx>(
body_span: Span,
bcb: BasicCoverageBlock,
bcb_data: &'a BasicCoverageBlockData,
-) -> impl Iterator<Item = SpanFromMir> + Captures<'a> + Captures<'tcx> {
- bcb_data.basic_blocks.iter().flat_map(move |&bb| {
+ initial_covspans: &mut Vec<SpanFromMir>,
+ holes: &mut Vec<Hole>,
+) {
+ for &bb in &bcb_data.basic_blocks {
let data = &mir_body[bb];
let unexpand = move |expn_span| {
@@ -146,24 +209,32 @@ fn bcb_to_initial_coverage_spans<'a, 'tcx>(
.filter(|(span, _)| !span.source_equal(body_span))
};
- let statement_spans = data.statements.iter().filter_map(move |statement| {
+ let mut extract_statement_span = |statement| {
let expn_span = filtered_statement_span(statement)?;
let (span, visible_macro) = unexpand(expn_span)?;
// A statement that looks like the assignment of a closure expression
// is treated as a "hole" span, to be carved out of other spans.
- Some(SpanFromMir::new(span, visible_macro, bcb, is_closure_like(statement)))
- });
+ if is_closure_like(statement) {
+ holes.push(Hole { span });
+ } else {
+ initial_covspans.push(SpanFromMir::new(span, visible_macro, bcb));
+ }
+ Some(())
+ };
+ for statement in data.statements.iter() {
+ extract_statement_span(statement);
+ }
- let terminator_span = Some(data.terminator()).into_iter().filter_map(move |terminator| {
+ let mut extract_terminator_span = |terminator| {
let expn_span = filtered_terminator_span(terminator)?;
let (span, visible_macro) = unexpand(expn_span)?;
- Some(SpanFromMir::new(span, visible_macro, bcb, false))
- });
-
- statement_spans.chain(terminator_span)
- })
+ initial_covspans.push(SpanFromMir::new(span, visible_macro, bcb));
+ Some(())
+ };
+ extract_terminator_span(data.terminator());
+ }
}
fn is_closure_like(statement: &Statement<'_>) -> bool {
@@ -330,6 +401,22 @@ fn unexpand_into_body_span_with_prev(
Some((curr, prev))
}
+#[derive(Debug)]
+struct Hole {
+ span: Span,
+}
+
+impl Hole {
+ fn merge_if_overlapping_or_adjacent(&mut self, other: &mut Self) -> bool {
+ if !self.span.overlaps_or_adjacent(other.span) {
+ return false;
+ }
+
+ self.span = self.span.to(other.span);
+ true
+ }
+}
+
#[derive(Debug)]
pub(super) struct SpanFromMir {
/// A span that has been extracted from MIR and then "un-expanded" back to
@@ -342,23 +429,30 @@ pub(super) struct SpanFromMir {
pub(super) span: Span,
visible_macro: Option<Symbol>,
pub(super) bcb: BasicCoverageBlock,
- /// If true, this covspan represents a "hole" that should be carved out
- /// from other spans, e.g. because it represents a closure expression that
- /// will be instrumented separately as its own function.
- pub(super) is_hole: bool,
}
impl SpanFromMir {
fn for_fn_sig(fn_sig_span: Span) -> Self {
- Self::new(fn_sig_span, None, START_BCB, false)
+ Self::new(fn_sig_span, None, START_BCB)
+ }
+
+ fn new(span: Span, visible_macro: Option<Symbol>, bcb: BasicCoverageBlock) -> Self {
+ Self { span, visible_macro, bcb }
}
- fn new(
- span: Span,
- visible_macro: Option<Symbol>,
- bcb: BasicCoverageBlock,
- is_hole: bool,
- ) -> Self {
- Self { span, visible_macro, bcb, is_hole }
+ /// Splits this span into 0-2 parts:
+ /// - The part that is strictly before the hole span, if any.
+ /// - The part that is strictly after the hole span, if any.
+ fn split_around_hole_span(&self, hole_span: Span) -> (Option<Self>, Option<Self>) {
+ let before = try {
+ let span = self.span.trim_end(hole_span)?;
+ Self { span, ..*self }
+ };
+ let after = try {
+ let span = self.span.trim_start(hole_span)?;
+ Self { span, ..*self }
+ };
+
+ (before, after)
}
}
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index b2ca01fe3b94c..82179a4a05867 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -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 {
diff --git a/compiler/rustc_span/src/tests.rs b/compiler/rustc_span/src/tests.rs
index cb88fa89058dc..48fa786fb1c80 100644
--- a/compiler/rustc_span/src/tests.rs
+++ b/compiler/rustc_span/src/tests.rs
@@ -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);
+}
diff --git a/tests/coverage/closure_macro.cov-map b/tests/coverage/closure_macro.cov-map
index fd8fbd9fa7575..156947f4e21c1 100644
--- a/tests/coverage/closure_macro.cov-map
+++ b/tests/coverage/closure_macro.cov-map
@@ -7,16 +7,14 @@ Number of file 0 mappings: 1
- Code(Counter(0)) at (prev + 29, 1) to (start + 2, 2)
Function name: closure_macro::main
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 21, 01, 01, 21, 02, 02, 09, 00, 12, 02, 00, 0f, 00, 54, 05, 00, 54, 00, 55, 02, 02, 09, 02, 0b, 01, 03, 01, 00, 02]
+Raw bytes (31): 0x[01, 01, 01, 01, 05, 05, 01, 21, 01, 01, 21, 02, 02, 09, 00, 0f, 05, 00, 54, 00, 55, 02, 02, 09, 02, 0b, 01, 03, 01, 00, 02]
Number of files: 1
- file 0 => global file 1
Number of expressions: 1
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
- Code(Counter(0)) at (prev + 33, 1) to (start + 1, 33)
-- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 18)
- = (c0 - c1)
-- Code(Expression(0, Sub)) at (prev + 0, 15) to (start + 0, 84)
+- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 15)
= (c0 - c1)
- Code(Counter(1)) at (prev + 0, 84) to (start + 0, 85)
- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 2, 11)
diff --git a/tests/coverage/closure_macro_async.cov-map b/tests/coverage/closure_macro_async.cov-map
index 43b52008f33e3..0f2b4e0174836 100644
--- a/tests/coverage/closure_macro_async.cov-map
+++ b/tests/coverage/closure_macro_async.cov-map
@@ -15,16 +15,14 @@ Number of file 0 mappings: 1
- Code(Counter(0)) at (prev + 35, 1) to (start + 0, 43)
Function name: closure_macro_async::test::{closure#0}
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 23, 2b, 01, 21, 02, 02, 09, 00, 12, 02, 00, 0f, 00, 54, 05, 00, 54, 00, 55, 02, 02, 09, 02, 0b, 01, 03, 01, 00, 02]
+Raw bytes (31): 0x[01, 01, 01, 01, 05, 05, 01, 23, 2b, 01, 21, 02, 02, 09, 00, 0f, 05, 00, 54, 00, 55, 02, 02, 09, 02, 0b, 01, 03, 01, 00, 02]
Number of files: 1
- file 0 => global file 1
Number of expressions: 1
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
- Code(Counter(0)) at (prev + 35, 43) to (start + 1, 33)
-- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 18)
- = (c0 - c1)
-- Code(Expression(0, Sub)) at (prev + 0, 15) to (start + 0, 84)
+- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 15)
= (c0 - c1)
- Code(Counter(1)) at (prev + 0, 84) to (start + 0, 85)
- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 2, 11)