diff options
| author | bors <bors@rust-lang.org> | 2024-02-13 17:27:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-13 17:27:25 +0000 |
| commit | a84bb95a1f65bfe25038f188763a18e096a86ab2 (patch) | |
| tree | 77f04631c0e3ea7792402cd51ed524f7142e0cc3 /compiler/rustc_llvm/llvm-wrapper | |
| parent | eaff1af8fdd18ee3eb05167b2836042b7d4315f6 (diff) | |
| parent | 8dffa39367044929201594eb785fea54a90c56be (diff) | |
| download | rust-a84bb95a1f65bfe25038f188763a18e096a86ab2.tar.gz rust-a84bb95a1f65bfe25038f188763a18e096a86ab2.zip | |
Auto merge of #121036 - matthiaskrgr:rollup-ul05q8e, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #114877 (unstable-book: add quick-edit link) - #120548 (rustdoc: Fix handling of doc_auto_cfg feature for cfg attributes on glob reexport) - #120549 (modify alias-relate to also normalize ambiguous opaques) - #120959 (Remove good path delayed bugs) - #120978 (match lowering: simplify block creation) - #121019 (coverage: Simplify some parts of the coverage span refiner) - #121021 (Extend intra-doc link chapter in the rustdoc book) - #121031 (RustWrapper: adapt for coverage mapping API changes) Failed merges: - #121014 (Remove `force_print_diagnostic`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp index 373bc5cc581..627be997513 100644 --- a/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp @@ -139,7 +139,7 @@ extern "C" void LLVMRustCoverageWriteMappingToBuffer( RustMappingRegions, NumMappingRegions)) { MappingRegions.emplace_back( fromRust(Region.Count), fromRust(Region.FalseCount), -#if LLVM_VERSION_GE(18, 0) +#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0) coverage::CounterMappingRegion::MCDCParameters{}, #endif Region.FileID, Region.ExpandedFileID, |