bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

coverage: Flatten guard logic in maybe_flush_pending_dups

Browse source
This commit is contained in:
Zalathar 2023-10-16 20:56:16 +11:00
parent 97d1a9120e
commit 7bbe4be568
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_mir_transform/src/coverage/spans.rs
View file

@ -456,14 +456,16 @@ impl<'a> CoverageSpansGenerator<'a> {
/// In either case, no more spans will match the span of `pending_dups`, so /// In either case, no more spans will match the span of `pending_dups`, so
/// add the `pending_dups` if they don't overlap `curr`, and clear the list. /// add the `pending_dups` if they don't overlap `curr`, and clear the list.
fn maybe_flush_pending_dups(&mut self) { fn maybe_flush_pending_dups(&mut self) {
if let Some(dup) = self.pending_dups.last() let Some(last_dup) = self.pending_dups.last() else { return };
&& dup.span != self.prev().span if last_dup.span == self.prev().span {
{ return;
}
debug!( debug!(
" SAME spans, but pending_dups are NOT THE SAME, so BCBs matched on \ " SAME spans, but pending_dups are NOT THE SAME, so BCBs matched on \
previous iteration, or prev started a new disjoint span" previous iteration, or prev started a new disjoint span"
); );
if dup.span.hi() <= self.curr().span.lo() { if last_dup.span.hi() <= self.curr().span.lo() {
let pending_dups = self.pending_dups.split_off(0); let pending_dups = self.pending_dups.split_off(0);
for dup in pending_dups.into_iter() { for dup in pending_dups.into_iter() {
debug!(" ...adding at least one pending={:?}", dup); debug!(" ...adding at least one pending={:?}", dup);
@ -473,7 +475,6 @@ impl<'a> CoverageSpansGenerator<'a> {
self.pending_dups.clear(); self.pending_dups.clear();
} }
} }
}
/// Advance `prev` to `curr` (if any), and `curr` to the next `CoverageSpan` in sorted order. /// Advance `prev` to `curr` (if any), and `curr` to the next `CoverageSpan` in sorted order.
fn next_coverage_span(&mut self) -> bool { fn next_coverage_span(&mut self) -> bool {