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

coverage: Avoid early returns from mir_to_initial_sorted_coverage_spans

Browse Source
This commit is contained in:
Zalathar 2023-12-22 14:11:42 +11:00
parent f688dd684f
commit 506b9f9689
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs
View File

@ -15,27 +15,26 @@ pub(super) fn mir_to_initial_sorted_coverage_spans(
basic_coverage_blocks: &CoverageGraph, basic_coverage_blocks: &CoverageGraph,
) -> Vec<CoverageSpan> { ) -> Vec<CoverageSpan> {
let &ExtractedHirInfo { is_async_fn, fn_sig_span, body_span, .. } = hir_info; let &ExtractedHirInfo { is_async_fn, fn_sig_span, body_span, .. } = hir_info;
let mut initial_spans = vec![CoverageSpan::for_fn_sig(fn_sig_span)];
if is_async_fn { if is_async_fn {
// An async function desugars into a function that returns a future, // An async function desugars into a function that returns a future,
// with the user code wrapped in a closure. Any spans in the desugared // with the user code wrapped in a closure. Any spans in the desugared
// outer function will be unhelpful, so just produce a single span // outer function will be unhelpful, so just keep the signature span
// associating the function signature with its entry BCB. // and ignore all of the spans in the MIR body.
return vec![CoverageSpan::for_fn_sig(fn_sig_span)]; } else {
} 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));
}
let mut initial_spans = Vec::with_capacity(mir_body.basic_blocks.len() * 2); // If no spans were extracted from the body, discard the signature span.
for (bcb, bcb_data) in basic_coverage_blocks.iter_enumerated() { // FIXME: This preserves existing behavior; consider getting rid of it.
initial_spans.extend(bcb_to_initial_coverage_spans(mir_body, body_span, bcb, bcb_data)); if initial_spans.len() == 1 {
initial_spans.clear();
}
} }
if initial_spans.is_empty() {
// This can happen if, for example, the function is unreachable (contains only a
// `BasicBlock`(s) with an `Unreachable` terminator).
return initial_spans;
}
initial_spans.push(CoverageSpan::for_fn_sig(fn_sig_span));
initial_spans.sort_by(|a, b| { initial_spans.sort_by(|a, b| {
// First sort by span start. // First sort by span start.
Ord::cmp(&a.span.lo(), &b.span.lo()) Ord::cmp(&a.span.lo(), &b.span.lo())