Skip to content

Commit a990864

Browse files
zhuyunxingLambdaris
zhuyunxing
authored and
Lambdaris
committed
coverage. Disable supporting mcdc on llvm-18
1 parent 9b72238 commit a990864

File tree

13 files changed

+25
-72
lines changed

13 files changed

+25
-72
lines changed

‎compiler/rustc_codegen_llvm/src/builder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,7 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
17671767
) {
17681768
debug!("mcdc_parameters() with args ({:?}, {:?}, {:?})", fn_name, hash, bitmap_bytes);
17691769

1770-
assert!(llvm_util::get_version() >= (18, 0, 0), "MCDC intrinsics require LLVM 18 or later");
1770+
assert!(llvm_util::get_version() >= (19, 0, 0), "MCDC intrinsics require LLVM 19 or later");
17711771

17721772
let llfn = unsafe { llvm::LLVMRustGetInstrProfMCDCParametersIntrinsic(self.cx().llmod) };
17731773
let llty = self.cx.type_func(
@@ -1802,7 +1802,7 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
18021802
"mcdc_tvbitmap_update() with args ({:?}, {:?}, {:?}, {:?}, {:?})",
18031803
fn_name, hash, bitmap_bytes, bitmap_index, mcdc_temp
18041804
);
1805-
assert!(llvm_util::get_version() >= (18, 0, 0), "MCDC intrinsics require LLVM 18 or later");
1805+
assert!(llvm_util::get_version() >= (19, 0, 0), "MCDC intrinsics require LLVM 19 or later");
18061806

18071807
let llfn =
18081808
unsafe { llvm::LLVMRustGetInstrProfMCDCTVBitmapUpdateIntrinsic(self.cx().llmod) };
@@ -1844,7 +1844,7 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
18441844
"mcdc_condbitmap_update() with args ({:?}, {:?}, {:?}, {:?}, {:?})",
18451845
fn_name, hash, cond_loc, mcdc_temp, bool_value
18461846
);
1847-
assert!(llvm_util::get_version() >= (18, 0, 0), "MCDC intrinsics require LLVM 18 or later");
1847+
assert!(llvm_util::get_version() >= (19, 0, 0), "MCDC intrinsics require LLVM 19 or later");
18481848
let llfn = unsafe { llvm::LLVMRustGetInstrProfMCDCCondBitmapIntrinsic(self.cx().llmod) };
18491849
let llty = self.cx.type_func(
18501850
&[

‎compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -95,38 +95,7 @@ struct LLVMRustMCDCParameters {
9595
LLVMRustMCDCBranchParameters BranchParameters;
9696
};
9797

98-
// LLVM representations for `MCDCParameters` evolved from LLVM 18 to 19.
99-
// Look at representations in 18
100-
// https://github.com/rust-lang/llvm-project/blob/66a2881a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L253-L263
101-
// and representations in 19
102-
// https://github.com/llvm/llvm-project/blob/843cc474faefad1d639f4c44c1cf3ad7dbda76c8/llvm/include/llvm/ProfileData/Coverage/MCDCTypes.h
103-
#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0)
104-
static coverage::CounterMappingRegion::MCDCParameters
105-
fromRust(LLVMRustMCDCParameters Params) {
106-
auto parameter = coverage::CounterMappingRegion::MCDCParameters{};
107-
switch (Params.Tag) {
108-
case LLVMRustMCDCParametersTag::None:
109-
return parameter;
110-
case LLVMRustMCDCParametersTag::Decision:
111-
parameter.BitmapIdx =
112-
static_cast<unsigned>(Params.DecisionParameters.BitmapIdx),
113-
parameter.NumConditions =
114-
static_cast<unsigned>(Params.DecisionParameters.NumConditions);
115-
return parameter;
116-
case LLVMRustMCDCParametersTag::Branch:
117-
parameter.ID = static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
118-
Params.BranchParameters.ConditionID),
119-
parameter.FalseID =
120-
static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
121-
Params.BranchParameters.ConditionIDs[0]),
122-
parameter.TrueID =
123-
static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
124-
Params.BranchParameters.ConditionIDs[1]);
125-
return parameter;
126-
}
127-
report_fatal_error("Bad LLVMRustMCDCParametersTag!");
128-
}
129-
#elif LLVM_VERSION_GE(19, 0)
98+
#if LLVM_VERSION_GE(19, 0)
13099
static coverage::mcdc::Parameters fromRust(LLVMRustMCDCParameters Params) {
131100
switch (Params.Tag) {
132101
case LLVMRustMCDCParametersTag::None:
@@ -222,12 +191,16 @@ extern "C" void LLVMRustCoverageWriteMappingToBuffer(
222191
MappingRegions.emplace_back(
223192
fromRust(Region.Count), fromRust(Region.FalseCount),
224193
#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0)
225-
// LLVM 19 may move this argument to last.
226-
fromRust(Region.MCDCParameters),
194+
coverage::CounterMappingRegion::MCDCParameters{},
227195
#endif
228196
Region.FileID, Region.ExpandedFileID, // File IDs, then region info.
229197
Region.LineStart, Region.ColumnStart, Region.LineEnd, Region.ColumnEnd,
230-
fromRust(Region.Kind));
198+
fromRust(Region.Kind)
199+
#if LLVM_VERSION_GE(19, 0)
200+
,
201+
fromRust(Region.MCDCParameters)
202+
#endif
203+
);
231204
}
232205

233206
std::vector<coverage::CounterExpression> Expressions;

‎compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,31 +1552,21 @@ LLVMRustGetInstrProfIncrementIntrinsic(LLVMModuleRef M) {
15521552

15531553
extern "C" LLVMValueRef
15541554
LLVMRustGetInstrProfMCDCParametersIntrinsic(LLVMModuleRef M) {
1555-
#if LLVM_VERSION_GE(18, 0)
1555+
#if LLVM_VERSION_GE(19, 0)
15561556
return wrap(llvm::Intrinsic::getDeclaration(
15571557
unwrap(M), llvm::Intrinsic::instrprof_mcdc_parameters));
15581558
#else
1559-
report_fatal_error("LLVM 18.0 is required for mcdc intrinsic functions");
1559+
report_fatal_error("LLVM 19.0 is required for mcdc intrinsic functions");
15601560
#endif
15611561
}
15621562

15631563
extern "C" LLVMValueRef
15641564
LLVMRustGetInstrProfMCDCTVBitmapUpdateIntrinsic(LLVMModuleRef M) {
1565-
#if LLVM_VERSION_GE(18, 0)
1565+
#if LLVM_VERSION_GE(19, 0)
15661566
return wrap(llvm::Intrinsic::getDeclaration(
15671567
unwrap(M), llvm::Intrinsic::instrprof_mcdc_tvbitmap_update));
15681568
#else
1569-
report_fatal_error("LLVM 18.0 is required for mcdc intrinsic functions");
1570-
#endif
1571-
}
1572-
1573-
extern "C" LLVMValueRef
1574-
LLVMRustGetInstrProfMCDCCondBitmapIntrinsic(LLVMModuleRef M) {
1575-
#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0)
1576-
return wrap(llvm::Intrinsic::getDeclaration(
1577-
unwrap(M), llvm::Intrinsic::instrprof_mcdc_condbitmap_update));
1578-
#else
1579-
report_fatal_error("LLVM 18.0 is required for mcdc intrinsic functions");
1569+
report_fatal_error("LLVM 19.0 is required for mcdc intrinsic functions");
15801570
#endif
15811571
}
15821572

‎tests/coverage/mcdc/condition-limit.coverage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
LL| |#![feature(coverage_attribute)]
22
LL| |//@ edition: 2021
3-
LL| |//@ min-llvm-version: 18
4-
LL| |//@ ignore-llvm-version: 19 - 99
3+
LL| |//@ min-llvm-version: 19
54
LL| |//@ compile-flags: -Zcoverage-options=mcdc
65
LL| |//@ llvm-cov-flags: --show-branches=count --show-mcdc
76
LL| |

‎tests/coverage/mcdc/condition-limit.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
3-
//@ min-llvm-version: 18
4-
//@ ignore-llvm-version: 19 - 99
3+
//@ min-llvm-version: 19
54
//@ compile-flags: -Zcoverage-options=mcdc
65
//@ llvm-cov-flags: --show-branches=count --show-mcdc
76

‎tests/coverage/mcdc/if.coverage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
LL| |#![feature(coverage_attribute)]
22
LL| |//@ edition: 2021
3-
LL| |//@ min-llvm-version: 18
4-
LL| |//@ ignore-llvm-version: 19 - 99
3+
LL| |//@ min-llvm-version: 19
54
LL| |//@ compile-flags: -Zcoverage-options=mcdc
65
LL| |//@ llvm-cov-flags: --show-branches=count --show-mcdc
76
LL| |

‎tests/coverage/mcdc/if.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
3-
//@ min-llvm-version: 18
4-
//@ ignore-llvm-version: 19 - 99
3+
//@ min-llvm-version: 19
54
//@ compile-flags: -Zcoverage-options=mcdc
65
//@ llvm-cov-flags: --show-branches=count --show-mcdc
76

‎tests/coverage/mcdc/inlined_expressions.coverage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
LL| |#![feature(coverage_attribute)]
22
LL| |//@ edition: 2021
3-
LL| |//@ min-llvm-version: 18
4-
LL| |//@ ignore-llvm-version: 19 - 99
3+
LL| |//@ min-llvm-version: 19
54
LL| |//@ compile-flags: -Zcoverage-options=mcdc -Copt-level=z -Cllvm-args=--inline-threshold=0
65
LL| |//@ llvm-cov-flags: --show-branches=count --show-mcdc
76
LL| |

‎tests/coverage/mcdc/inlined_expressions.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
3-
//@ min-llvm-version: 18
4-
//@ ignore-llvm-version: 19 - 99
3+
//@ min-llvm-version: 19
54
//@ compile-flags: -Zcoverage-options=mcdc -Copt-level=z -Cllvm-args=--inline-threshold=0
65
//@ llvm-cov-flags: --show-branches=count --show-mcdc
76

‎tests/coverage/mcdc/nested_if.coverage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
LL| |#![feature(coverage_attribute)]
22
LL| |//@ edition: 2021
3-
LL| |//@ min-llvm-version: 18
4-
LL| |//@ ignore-llvm-version: 19 - 99
3+
LL| |//@ min-llvm-version: 19
54
LL| |//@ compile-flags: -Zcoverage-options=mcdc
65
LL| |//@ llvm-cov-flags: --show-branches=count --show-mcdc
76
LL| |

‎tests/coverage/mcdc/nested_if.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
3-
//@ min-llvm-version: 18
4-
//@ ignore-llvm-version: 19 - 99
3+
//@ min-llvm-version: 19
54
//@ compile-flags: -Zcoverage-options=mcdc
65
//@ llvm-cov-flags: --show-branches=count --show-mcdc
76

‎tests/coverage/mcdc/non_control_flow.coverage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
LL| |#![feature(coverage_attribute)]
22
LL| |//@ edition: 2021
3-
LL| |//@ min-llvm-version: 18
4-
LL| |//@ ignore-llvm-version: 19 - 99
3+
LL| |//@ min-llvm-version: 19
54
LL| |//@ compile-flags: -Zcoverage-options=mcdc
65
LL| |//@ llvm-cov-flags: --show-branches=count --show-mcdc
76
LL| |

‎tests/coverage/mcdc/non_control_flow.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
3-
//@ min-llvm-version: 18
4-
//@ ignore-llvm-version: 19 - 99
3+
//@ min-llvm-version: 19
54
//@ compile-flags: -Zcoverage-options=mcdc
65
//@ llvm-cov-flags: --show-branches=count --show-mcdc
76

0 commit comments

Comments
 (0)