Merge a00c89e into 9d28fe3

Author: Lambdaris

compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

@@ -7,6 +7,7 @@ use rustc_codegen_ssa::traits::{
 };
 use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
 use rustc_middle::mir::coverage::CoverageKind;
+use rustc_middle::mir::{Statement, StatementKind};
 use rustc_middle::ty::Instance;
 use tracing::{debug, instrument};
 
@@ -91,9 +92,8 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
 
 impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
     fn init_coverage(&mut self, instance: Instance<'tcx>) {
-        let Some(function_coverage_info) =
-            self.tcx.instance_mir(instance.def).function_coverage_info.as_deref()
-        else {
+        let mir_body = self.tcx.instance_mir(instance.def);
+        let Some(function_coverage_info) = mir_body.function_coverage_info.as_deref() else {
             return;
         };
 
@@ -102,6 +102,25 @@ impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
             return;
         }
 
+        let is_counter_instrument = |statement: &Statement<'_>| {
+            let StatementKind::Coverage(cov_kind) = &statement.kind else {
+                return false;
+            };
+            matches!(cov_kind, CoverageKind::CounterIncrement { .. })
+        };
+        // Some instances like `DropGlue` clone mir body from others and modified the basic blocks after coverage pass.
+        // Such instances might have same `function_coverage_info` as the primary but have no associated coverage statement.
+        // Ignore these instances here.
+        if !mir_body
+            .basic_blocks
+            .iter()
+            .map(|bb| &bb.statements)
+            .flatten()
+            .any(is_counter_instrument)
+        {
+            return;
+        }
+
         let fn_name = self.get_pgo_func_name_var(instance);
         let hash = self.const_u64(function_coverage_info.function_source_hash);
         let bitmap_bits = self.const_u32(function_coverage_info.mcdc_bitmap_bits as u32);