Skip to content

Commit 48872a1

Browse files
committed
coverage. Fix that instances with no mcdc statements still initialize mcdc parameters
1 parent eb33b43 commit 48872a1

File tree

1 file changed

+19
-3
lines changed
  • compiler/rustc_codegen_llvm/src/coverageinfo

1 file changed

+19
-3
lines changed

compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

+19-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
99
use rustc_llvm::RustString;
1010
use rustc_middle::bug;
1111
use rustc_middle::mir::coverage::CoverageKind;
12+
use rustc_middle::mir::{Statement, StatementKind};
1213
use rustc_middle::ty::layout::HasTyCtxt;
1314
use rustc_middle::ty::Instance;
1415
use rustc_target::abi::{Align, Size};
@@ -92,9 +93,8 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
9293

9394
impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
9495
fn init_coverage(&mut self, instance: Instance<'tcx>) {
95-
let Some(function_coverage_info) =
96-
self.tcx.instance_mir(instance.def).function_coverage_info.as_deref()
97-
else {
96+
let mir_body = self.tcx.instance_mir(instance.def);
97+
let Some(function_coverage_info) = mir_body.function_coverage_info.as_deref() else {
9898
return;
9999
};
100100

@@ -103,6 +103,22 @@ impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
103103
return;
104104
}
105105

106+
let is_mcdc_statement = |statement: &Statement<'_>| {
107+
let StatementKind::Coverage(cov_kind) = &statement.kind else {
108+
return false;
109+
};
110+
matches!(
111+
cov_kind,
112+
CoverageKind::TestVectorBitmapUpdate { .. } | CoverageKind::CondBitmapUpdate { .. }
113+
)
114+
};
115+
// Some instances like `DropGlue` clone mir body from others and modified the basic blocks after coverage pass.
116+
// Such instances might have same `function_coverage_info` as the primary but have no associated coverage statement.
117+
// Ignore these instances here.
118+
if !mir_body.basic_blocks.iter().map(|bb| &bb.statements).flatten().any(is_mcdc_statement) {
119+
return;
120+
}
121+
106122
let fn_name = self.get_pgo_func_name_var(instance);
107123
let hash = self.const_u64(function_coverage_info.function_source_hash);
108124
let bitmap_bytes = self.const_u32(function_coverage_info.mcdc_bitmap_bytes);

0 commit comments

Comments
 (0)