coverage. Refactor MCDCInfoBuilder for pattern matching implementation and change the way to calculate decision depth

Author: zhuyunxing

compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

@@ -210,6 +210,12 @@ impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
                 bx.mcdc_tvbitmap_update(fn_name, hash, bitmap_index, cond_bitmap);
                 bx.mcdc_condbitmap_reset(cond_bitmap);
             }
+            CoverageKind::CondBitmapReset { decision_depth } => {
+                let cond_bitmap = bx.coverage_cx()
+                                    .try_get_mcdc_condition_bitmap(&instance, decision_depth)
+                                    .expect("mcdc cond bitmap should have been allocated for merging into the global bitmap");
+                bx.mcdc_condbitmap_reset(cond_bitmap);
+            }
         }
     }
 }

compiler/rustc_middle/src/mir/coverage.rs

@@ -50,6 +50,15 @@ rustc_index::newtype_index! {
     pub struct ExpressionId {}
 }
 
+rustc_index::newtype_index! {
+    /// ID of a mcdc decision. Used to identify decision in a function.
+    #[derive(HashStable)]
+    #[encodable]
+    #[orderable]
+    #[debug_format = "DecisionId({})"]
+    pub struct DecisionId {}
+}
+
 rustc_index::newtype_index! {
     /// ID of a mcdc condition. Used by llvm to check mcdc coverage.
     ///
@@ -126,6 +135,11 @@ pub enum CoverageKind {
     /// This is eventually lowered to instruments updating mcdc temp variables.
     CondBitmapUpdate { index: u32, decision_depth: u16 },
 
+    /// Marks the point in MIR control flow where a condition bitmap is reset.
+    ///
+    /// This is eventually lowered to instruments set the mcdc temp variable to zero.
+    CondBitmapReset { decision_depth: u16 },
+
     /// Marks the point in MIR control flow represented by a evaluated decision.
     ///
     /// This is eventually lowered to `llvm.instrprof.mcdc.tvbitmap.update` in LLVM IR.
@@ -143,6 +157,9 @@ impl Debug for CoverageKind {
             CondBitmapUpdate { index, decision_depth } => {
                 write!(fmt, "CondBitmapUpdate(index={:?}, depth={:?})", index, decision_depth)
             }
+            CondBitmapReset { decision_depth } => {
+                write!(fmt, "CondBitmapReset(depth={:?})", decision_depth)
+            }
             TestVectorBitmapUpdate { bitmap_idx, decision_depth } => {
                 write!(fmt, "TestVectorUpdate({:?}, depth={:?})", bitmap_idx, decision_depth)
             }
@@ -247,7 +264,7 @@ pub struct CoverageInfoHi {
     pub branch_spans: Vec<BranchSpan>,
     /// Branch spans generated by mcdc. Because of some limits mcdc builder give up generating
     /// decisions including them so that they are handled as normal branch spans.
-    pub mcdc_degraded_branch_spans: Vec<MCDCBranchSpan>,
+    pub mcdc_degraded_spans: Vec<MCDCBranchSpan>,
     pub mcdc_spans: Vec<(MCDCDecisionSpan, Vec<MCDCBranchSpan>)>,
 }
 
@@ -272,8 +289,11 @@ pub struct ConditionInfo {
 pub struct MCDCBranchSpan {
     pub span: Span,
     pub condition_info: ConditionInfo,
-    pub true_marker: BlockMarkerId,
-    pub false_marker: BlockMarkerId,
+    // For boolean decisions and most pattern matching decisions there is only
+    // one true marker and one false marker in each branch. But for matching decisions
+    // with `|` there can be several.
+    pub true_markers: Vec<BlockMarkerId>,
+    pub false_markers: Vec<BlockMarkerId>,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -289,7 +309,12 @@ pub struct MCDCDecisionSpan {
     pub span: Span,
     pub end_markers: Vec<BlockMarkerId>,
     pub decision_depth: u16,
-    pub num_conditions: usize,
+}
+
+impl MCDCDecisionSpan {
+    pub fn new(span: Span) -> Self {
+        Self { span, end_markers: Vec::new(), decision_depth: 0 }
+    }
 }
 
 /// Summarizes coverage IDs inserted by the `InstrumentCoverage` MIR pass

compiler/rustc_middle/src/mir/pretty.rs

@@ -561,7 +561,7 @@ fn write_coverage_info_hi(
     let coverage::CoverageInfoHi {
         num_block_markers: _,
         branch_spans,
-        mcdc_degraded_branch_spans,
+        mcdc_degraded_spans,
         mcdc_spans,
     } = coverage_info_hi;
 
@@ -576,32 +576,27 @@ fn write_coverage_info_hi(
         did_print = true;
     }
 
-    for coverage::MCDCBranchSpan { span, true_marker, false_marker, .. } in
-        mcdc_degraded_branch_spans
-    {
+    for coverage::MCDCBranchSpan { span, true_markers, false_markers, .. } in mcdc_degraded_spans {
         writeln!(
             w,
-            "{INDENT}coverage branch {{ true: {true_marker:?}, false: {false_marker:?} }} => {span:?}",
+            "{INDENT}coverage branch {{ true: {true_markers:?}, false: {false_markers:?} }} => {span:?}",
         )?;
         did_print = true;
     }
 
-    for (
-        coverage::MCDCDecisionSpan { span, end_markers, decision_depth, num_conditions: _ },
-        conditions,
-    ) in mcdc_spans
+    for (coverage::MCDCDecisionSpan { span, end_markers, decision_depth }, conditions) in mcdc_spans
     {
         let num_conditions = conditions.len();
         writeln!(
             w,
             "{INDENT}coverage mcdc decision {{ num_conditions: {num_conditions:?}, end: {end_markers:?}, depth: {decision_depth:?} }} => {span:?}"
         )?;
-        for coverage::MCDCBranchSpan { span, condition_info, true_marker, false_marker } in
+        for coverage::MCDCBranchSpan { span, condition_info, true_markers, false_markers } in
             conditions
         {
             writeln!(
                 w,
-                "{INDENT}coverage mcdc branch {{ condition_id: {:?}, true: {true_marker:?}, false: {false_marker:?} }} => {span:?}",
+                "{INDENT}coverage mcdc branch {{ condition_id: {:?}, true: {true_markers:?}, false: {false_markers:?} }} => {span:?}",
                 condition_info.condition_id
             )?;
         }

compiler/rustc_mir_build/src/builder/coverageinfo.rs

@@ -144,10 +144,10 @@ impl CoverageInfoBuilder {
         // Separate path for handling branches when MC/DC is enabled.
         if let Some(mcdc_info) = self.mcdc_info.as_mut() {
             let inject_block_marker =
-                |source_info, block| self.markers.inject_block_marker(cfg, source_info, block);
+                |block| self.markers.inject_block_marker(cfg, source_info, block);
             mcdc_info.visit_evaluated_condition(
                 tcx,
-                source_info,
+                source_info.span,
                 true_block,
                 false_block,
                 inject_block_marker,
@@ -175,18 +175,18 @@ impl CoverageInfoBuilder {
         let branch_spans =
             branch_info.map(|branch_info| branch_info.branch_spans).unwrap_or_default();
 
-        let (mcdc_spans, mcdc_degraded_branch_spans) =
+        let (mcdc_degraded_spans, mcdc_spans) =
             mcdc_info.map(MCDCInfoBuilder::into_done).unwrap_or_default();
 
         // For simplicity, always return an info struct (without Option), even
         // if there's nothing interesting in it.
         Box::new(CoverageInfoHi {
             num_block_markers,
             branch_spans,
-            mcdc_degraded_branch_spans,
-            mcdc_spans,
-        })
-    }
+            mcdc_degraded_spans,
+            mcdc_spans
+    })
+}
 }
 
 impl<'tcx> Builder<'_, 'tcx> {