diff options
| author | bors <bors@rust-lang.org> | 2024-10-08 07:08:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-08 07:08:41 +0000 |
| commit | cf24c73141a77db730f4b7fda69dcd7e8b113b51 (patch) | |
| tree | 036b31c635fb5651cefd0f859046e5a174f8aef2 /compiler/rustc_mir_build/src/build/coverageinfo.rs | |
| parent | e6c46db4e9fd11e3183c397a59d946731034ede6 (diff) | |
| parent | acd64fa0d9e5c17de02a5b2a592163a377e33bcc (diff) | |
| download | rust-cf24c73141a77db730f4b7fda69dcd7e8b113b51.tar.gz rust-cf24c73141a77db730f4b7fda69dcd7e8b113b51.zip | |
Auto merge of #126733 - ZhuUx:llvm-19-adapt, r=Zalathar
[Coverage][MCDC] Adapt mcdc to llvm 19 Related issue: #126672 Also finish task 4 at #124144 [llvm #82448](https://github.com/llvm/llvm-project/pull/82448) has introduced some break changes into mcdc, causing incompatibility between llvm 18 and 19. This draft adapts to that change and gives up supporting for llvm-18.
Diffstat (limited to 'compiler/rustc_mir_build/src/build/coverageinfo.rs')
| -rw-r--r-- | compiler/rustc_mir_build/src/build/coverageinfo.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_mir_build/src/build/coverageinfo.rs b/compiler/rustc_mir_build/src/build/coverageinfo.rs index 204ee45bfa2..52a4a4b4b51 100644 --- a/compiler/rustc_mir_build/src/build/coverageinfo.rs +++ b/compiler/rustc_mir_build/src/build/coverageinfo.rs @@ -175,7 +175,7 @@ impl CoverageInfoBuilder { let branch_spans = branch_info.map(|branch_info| branch_info.branch_spans).unwrap_or_default(); - let (mcdc_decision_spans, mcdc_branch_spans) = + let (mcdc_spans, mcdc_degraded_branch_spans) = mcdc_info.map(MCDCInfoBuilder::into_done).unwrap_or_default(); // For simplicity, always return an info struct (without Option), even @@ -183,8 +183,8 @@ impl CoverageInfoBuilder { Box::new(CoverageInfoHi { num_block_markers, branch_spans, - mcdc_branch_spans, - mcdc_decision_spans, + mcdc_degraded_branch_spans, + mcdc_spans, }) } } |