@@ -9,6 +9,7 @@ use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
9
9
use rustc_llvm:: RustString ;
10
10
use rustc_middle:: bug;
11
11
use rustc_middle:: mir:: coverage:: CoverageKind ;
12
+ use rustc_middle:: mir:: { Statement , StatementKind } ;
12
13
use rustc_middle:: ty:: Instance ;
13
14
use rustc_middle:: ty:: layout:: HasTyCtxt ;
14
15
use rustc_target:: abi:: { Align , Size } ;
@@ -91,9 +92,8 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
91
92
92
93
impl < ' tcx > CoverageInfoBuilderMethods < ' tcx > for Builder < ' _ , ' _ , ' tcx > {
93
94
fn init_coverage ( & mut self , instance : Instance < ' tcx > ) {
94
- let Some ( function_coverage_info) =
95
- self . tcx . instance_mir ( instance. def ) . function_coverage_info . as_deref ( )
96
- else {
95
+ let mir_body = self . tcx . instance_mir ( instance. def ) ;
96
+ let Some ( function_coverage_info) = mir_body. function_coverage_info . as_deref ( ) else {
97
97
return ;
98
98
} ;
99
99
@@ -102,6 +102,19 @@ impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
102
102
return ;
103
103
}
104
104
105
+ let is_mcdc_statement = |statement : & Statement < ' _ > | {
106
+ let StatementKind :: Coverage ( cov_kind) = & statement. kind else {
107
+ return false ;
108
+ } ;
109
+ matches ! ( cov_kind, CoverageKind :: CounterIncrement { .. } )
110
+ } ;
111
+ // Some instances like `DropGlue` clone mir body from others and modified the basic blocks after coverage pass.
112
+ // Such instances might have same `function_coverage_info` as the primary but have no associated coverage statement.
113
+ // Ignore these instances here.
114
+ if !mir_body. basic_blocks . iter ( ) . map ( |bb| & bb. statements ) . flatten ( ) . any ( is_mcdc_statement) {
115
+ return ;
116
+ }
117
+
105
118
let fn_name = self . get_pgo_func_name_var ( instance) ;
106
119
let hash = self . const_u64 ( function_coverage_info. function_source_hash ) ;
107
120
let bitmap_bytes = self . const_u32 ( function_coverage_info. mcdc_bitmap_bytes ) ;
0 commit comments