coverage: Add CLI 'condition' coverage option

Author: RenjiSann

compiler/rustc_interface/src/tests.rs

@@ -761,7 +761,7 @@ fn test_unstable_options_tracking_hash() {
         })
     );
     tracked!(codegen_backend, Some("abc".to_string()));
-    tracked!(coverage_options, CoverageOptions { branch: true, mcdc: true });
+    tracked!(coverage_options, CoverageOptions { branch: true, condition: true, mcdc: true });
     tracked!(crate_attr, vec!["abc".to_string()]);
     tracked!(cross_crate_inline_threshold, InliningThreshold::Always);
     tracked!(debug_info_for_profiling, true);

compiler/rustc_session/src/config.rs

@@ -148,6 +148,8 @@ pub enum InstrumentCoverage {
 pub struct CoverageOptions {
     /// Add branch coverage instrumentation.
     pub branch: bool,
+    /// Add condition coverage instrumentation.
+    pub condition: bool,
     /// Add mcdc coverage instrumentation.
     pub mcdc: bool,
 }

compiler/rustc_session/src/options.rs

@@ -951,8 +951,13 @@ mod parse {
                     slot.mcdc = false;
                 }
                 "branch" => slot.branch = true,
+                "condition" => {
+                    slot.branch = true;
+                    slot.condition = true;
+                }
                 "mcdc" => {
                     slot.branch = true;
+                    slot.condition = true;
                     slot.mcdc = true;
                 }
                 _ => return false,

compiler/rustc_session/src/session.rs

@@ -352,6 +352,10 @@ impl Session {
         self.instrument_coverage() && self.opts.unstable_opts.coverage_options.branch
     }
 
+    pub fn instrument_coverage_condition(&self) -> bool {
+        self.instrument_coverage() && self.opts.unstable_opts.coverage_options.condition
+    }
+
     pub fn instrument_coverage_mcdc(&self) -> bool {
         self.instrument_coverage() && self.opts.unstable_opts.coverage_options.mcdc
     }