about summary refs log tree commit diff
path: root/tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff
diff options
context:
space:
mode:
authorStuart Cook <Zalathar@users.noreply.github.com>2025-07-31 15:42:00 +1000
committerGitHub <noreply@github.com>2025-07-31 15:42:00 +1000
commit5c123c25e36121730634aa59f8a66a5469d4d73f (patch)
tree61ca676c3d931b89e0c713d9d6a98a6566cc5f94 /tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff
parent8628b78f24c01026d01b82afd3ec91a2019fe647 (diff)
parent2e6f4a59226fd82c526df0f61fefc6fea44e7750 (diff)
downloadrust-5c123c25e36121730634aa59f8a66a5469d4d73f.tar.gz
rust-5c123c25e36121730634aa59f8a66a5469d4d73f.zip
Rollup merge of #144663 - Zalathar:empty-span, r=petrochenkov
coverage: Re-land "Enlarge empty spans during MIR instrumentation"

This allows us to assume that coverage spans will only be discarded during codegen in very unusual situations.

---

This seemingly-simple change has a rather messy history:
- rust-lang/rust#140847
- rust-lang/rust#141650
- rust-lang/rust#144298
- rust-lang/rust#144480

Since then, a number of related changes have landed that should make it reasonable to try again:
- rust-lang/rust#144530
- rust-lang/rust#144560
- rust-lang/rust#144616

In particular, we have multiple fixes/mitigations, and a confirmed regression test for the original bug that is not triggered by re-landing the changes in this PR.
Diffstat (limited to 'tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff')
-rw-r--r--tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff b/tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff
index d465b8bded2..fa88211383a 100644
--- a/tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff
+++ b/tests/mir-opt/coverage/branch_match_arms.main.InstrumentCoverage.diff
@@ -40,7 +40,7 @@
 +     coverage Code { bcb: bcb5 } => $DIR/branch_match_arms.rs:19:17: 19:18 (#0);
 +     coverage Code { bcb: bcb5 } => $DIR/branch_match_arms.rs:19:23: 19:30 (#0);
 +     coverage Code { bcb: bcb5 } => $DIR/branch_match_arms.rs:19:31: 19:32 (#0);
-+     coverage Code { bcb: bcb2 } => $DIR/branch_match_arms.rs:21:2: 21:2 (#0);
++     coverage Code { bcb: bcb2 } => $DIR/branch_match_arms.rs:21:1: 21:2 (#0);
 + 
       bb0: {
 +         Coverage::VirtualCounter(bcb0);