about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-12-18 18:45:31 +0000
committerbors <bors@rust-lang.org>2023-12-18 18:45:31 +0000
commitbf9229a2e366b4c311f059014a4aa08af16de5d8 (patch)
tree3b1b343eafd3b25886fdf9458526679438b97728 /compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp
parent2a7634047a978207aa1c527ed484ae4ada9bba96 (diff)
parent9a24d8a1015e2720af5bfdb5cacbe0685ed11466 (diff)
downloadrust-bf9229a2e366b4c311f059014a4aa08af16de5d8.tar.gz
rust-bf9229a2e366b4c311f059014a4aa08af16de5d8.zip
Auto merge of #119082 - matthiaskrgr:rollup-3pzzwxk, r=matthiaskrgr
Rollup of 3 pull requests

Successful merges:

 - #118941 (llvm-wrapper: adapt for LLVM API changes)
 - #119068 (Copy 1.74.1 release notes to master)
 - #119080 (Comment out `change-id` in `config.example.toml`)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp')
-rw-r--r--compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp
index d61ec0b641c..373bc5cc581 100644
--- a/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp
+++ b/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp
@@ -139,6 +139,9 @@ extern "C" void LLVMRustCoverageWriteMappingToBuffer(
            RustMappingRegions, NumMappingRegions)) {
     MappingRegions.emplace_back(
         fromRust(Region.Count), fromRust(Region.FalseCount),
+#if LLVM_VERSION_GE(18, 0)
+        coverage::CounterMappingRegion::MCDCParameters{},
+#endif
         Region.FileID, Region.ExpandedFileID,
         Region.LineStart, Region.ColumnStart, Region.LineEnd, Region.ColumnEnd,
         fromRust(Region.Kind));