coverage: Arrange span extraction/refinement as a series of passes #126535
Conversation
|
r? @nnethercote rustbot has assigned @nnethercote. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
rustbot
added
the
A-code-coverage
Notes for review:The first patch renames several variables to be more consistent overall, to get that out of the way before moving code around. We then move big chunks of code from The remaining patches then perform other smaller rearrangements, once again using This PR looks complicated at a glance, but fundamentally isn't doing very much beyond moving code around. |
| // - 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<_>>(); |
There was a problem hiding this comment.
Side note: I though about using inline const to change this to:
let mut buckets = vec![(const { vec![] }); holes.len()];But currently there are false warnings (#126457) that make this annoying, and the old code is perfectly fine, so I left it as-is.
|
@bors r+ |
bors
added
S-waiting-on-bors
Rollup of 8 pull requests Successful merges: - rust-lang#125258 (Resolve elided lifetimes in assoc const to static if no other lifetimes are in scope) - rust-lang#126250 (docs(change): Don't mention a Cargo 2024 edition change for 1.79) - rust-lang#126288 (doc: Added commas where needed) - rust-lang#126346 (export std::os::fd module on HermitOS) - rust-lang#126468 (div_euclid, rem_euclid: clarify/extend documentation) - rust-lang#126531 (Add codegen test for `Request::provide_*`) - rust-lang#126535 (coverage: Arrange span extraction/refinement as a series of passes) - rust-lang#126538 (coverage: Several small improvements to graph code) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#126535 - Zalathar:covspans, r=nnethercote coverage: Arrange span extraction/refinement as a series of passes The old code for extracting/refining coverage spans from MIR has been dismantled and split up into several passes (e.g. see rust-lang#126294), but because this was done incrementally, the resulting code is disorganised. This PR addresses that by moving the main control-flow into a single function (`coverage::spans::extract_refined_covspans`) that more clearly shows the process as a series of separate steps, most delegated to helper functions in the same file. This should make it easier to understand and modify the refinement process. It also means that submodule `from_mir` is now only concerned with the details of extracting relevant spans from the various kinds of MIR statement/terminator. There should be no change to the resulting coverage maps, as demonstrated by the lack of changes to tests.
The old code for extracting/refining coverage spans from MIR has been dismantled and split up into several passes (e.g. see #126294), but because this was done incrementally, the resulting code is disorganised.
This PR addresses that by moving the main control-flow into a single function (
coverage::spans::extract_refined_covspans) that more clearly shows the process as a series of separate steps, most delegated to helper functions in the same file.This should make it easier to understand and modify the refinement process. It also means that submodule
from_miris now only concerned with the details of extracting relevant spans from the various kinds of MIR statement/terminator.There should be no change to the resulting coverage maps, as demonstrated by the lack of changes to tests.