coverage: Re-enable UnreachablePropagation for coverage builds
#122860
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @petrochenkov. 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
This comment was marked as resolved.
This comment was marked as resolved.
Zalathar
force-pushed
the
unused
branch
2 times, most recently
from
7b22c4d
to
7988ddd
Compare
This was referenced Mar 22, 2024
rustbot
added
S-blocked
|
@rustbot ready |
rustbot
added
S-waiting-on-review
cjgillot
reviewed
Mar 26, 2024
| }) | ||
| .filter({ | ||
| // We only need one arbitrary instance per definition. | ||
| let mut seen = FxHashSet::default(); |
There was a problem hiding this comment.
No need to create an inner scope for this. A function-level binding is good enough, it's moved into the closure anyway.
| @@ -354,78 +346,94 @@ fn add_unused_functions(cx: &CodegenCx<'_, '_>) { | |||
| assert!(cx.codegen_unit.is_code_coverage_dead_code_cgu()); | |||
|
|
|||
| let tcx = cx.tcx; | |||
| let usage = prepare_usage_sets(tcx); | |||
|
|
|||
| let is_unused_fn = |def_id: &&LocalDefId| -> bool { | |||
There was a problem hiding this comment.
The closure should take by value, and let the caller dereference.
|
@bors try @rust-timer queue |
|
Awaiting bors try build completion. @rustbot label: +S-waiting-on-perf |
rustbot
added
the
S-waiting-on-perf
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 26, 2024
coverage: Re-enable `UnreachablePropagation` for coverage builds This is a sequence of 3 related changes: - Clean up the existing code that scans for unused functions - Detect functions that were instrumented for coverage, but have had all their coverage statements removed by later MIR transforms (e.g. `UnreachablePropagation`) - Re-enable `UnreachablePropagation` in coverage builds Because we now detect functions that have lost their coverage statements, and treat them as unused, we don't need to worry about `UnreachablePropagation` removing all of those statements. This is demonstrated by `tests/coverage/unreachable.rs`. Fixes rust-lang#116171.
If a function was instrumented for coverage, but all of its coverage statements have been removed by later MIR transforms, it should be treated as "unused" even if the compiler generates an unreachable stub for it.
|
Addressed feedback (diff). I think I still prefer the way it was, but 🤷♂️. |
|
I'm not 100% sure, but I don't think we have any benchmarks that actually enable coverage. |
|
Thanks. |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2024
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#121843 (Implement `-L KIND=`@RUSTC_BUILTIN/...`)` - rust-lang#122860 (coverage: Re-enable `UnreachablePropagation` for coverage builds) - rust-lang#123021 (Make `TyCtxt::coroutine_layout` take coroutine's kind parameter) - rust-lang#123024 (CFI: Enable KCFI testing of run-pass tests) - rust-lang#123083 (lib: fix some unnecessary_cast clippy lint) - rust-lang#123116 (rustdoc: Swap fields and variant documentations) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2024
Rollup merge of rust-lang#122860 - Zalathar:unused, r=cjgillot coverage: Re-enable `UnreachablePropagation` for coverage builds This is a sequence of 3 related changes: - Clean up the existing code that scans for unused functions - Detect functions that were instrumented for coverage, but have had all their coverage statements removed by later MIR transforms (e.g. `UnreachablePropagation`) - Re-enable `UnreachablePropagation` in coverage builds Because we now detect functions that have lost their coverage statements, and treat them as unused, we don't need to worry about `UnreachablePropagation` removing all of those statements. This is demonstrated by `tests/coverage/unreachable.rs`. Fixes rust-lang#116171.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a sequence of 3 related changes:
UnreachablePropagation)UnreachablePropagationin coverage buildsBecause we now detect functions that have lost their coverage statements, and treat them as unused, we don't need to worry about
UnreachablePropagationremoving all of those statements. This is demonstrated bytests/coverage/unreachable.rs.Fixes #116171.