diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2024-03-22 13:34:26 +1100 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2024-03-26 11:46:04 +1100 |
| commit | 1cca2529d1c90458080be6cf271a92eedc49d399 (patch) | |
| tree | f9f6045dbc573bbcc5d2d042659a91007fc75b71 | |
| parent | 54116c8cae58f1d46f231fbeac5630a81b994a4c (diff) | |
| download | rust-1cca2529d1c90458080be6cf271a92eedc49d399.tar.gz rust-1cca2529d1c90458080be6cf271a92eedc49d399.zip | |
coverage: Re-enable `UnreachablePropagation` for coverage builds
| -rw-r--r-- | compiler/rustc_mir_transform/src/unreachable_prop.rs | 6 | ||||
| -rw-r--r-- | tests/coverage/unreachable.cov-map | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/compiler/rustc_mir_transform/src/unreachable_prop.rs b/compiler/rustc_mir_transform/src/unreachable_prop.rs index bff59aa6023..8ad7bc394c5 100644 --- a/compiler/rustc_mir_transform/src/unreachable_prop.rs +++ b/compiler/rustc_mir_transform/src/unreachable_prop.rs @@ -14,11 +14,7 @@ pub struct UnreachablePropagation; impl MirPass<'_> for UnreachablePropagation { fn is_enabled(&self, sess: &rustc_session::Session) -> bool { // Enable only under -Zmir-opt-level=2 as this can make programs less debuggable. - - // FIXME(#116171) Coverage gets confused by MIR passes that can remove all - // coverage statements from an instrumented function. This pass can be - // re-enabled when coverage codegen is robust against that happening. - sess.mir_opt_level() >= 2 && !sess.instrument_coverage() + sess.mir_opt_level() >= 2 } fn run_pass<'tcx>(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { diff --git a/tests/coverage/unreachable.cov-map b/tests/coverage/unreachable.cov-map index 55d124a16f5..9d4698527d0 100644 --- a/tests/coverage/unreachable.cov-map +++ b/tests/coverage/unreachable.cov-map @@ -14,11 +14,11 @@ Number of expressions: 0 Number of file 0 mappings: 1 - Code(Counter(0)) at (prev + 17, 1) to (start + 1, 37) -Function name: unreachable::unreachable_intrinsic -Raw bytes (9): 0x[01, 01, 00, 01, 01, 16, 01, 01, 2c] +Function name: unreachable::unreachable_intrinsic (unused) +Raw bytes (9): 0x[01, 01, 00, 01, 00, 16, 01, 01, 2c] Number of files: 1 - file 0 => global file 1 Number of expressions: 0 Number of file 0 mappings: 1 -- Code(Counter(0)) at (prev + 22, 1) to (start + 1, 44) +- Code(Zero) at (prev + 22, 1) to (start + 1, 44) |