coverage. Flatten ffi for MCDCParameter

Author: zhuyunxing

compiler/rustc_codegen_llvm/src/coverageinfo/ffi.rs

@@ -132,11 +132,12 @@ pub mod mcdc {
         condition_ids: [LLVMConditionId; 2],
     }
 
-    #[repr(C, u8)]
+    #[repr(C)]
+    #[derive(Clone, Copy, Debug)]
     pub enum ParameterTag {
-        None,
-        Decision,
-        Branch,
+        None = 0,
+        Decision = 1,
+        Branch = 2,
     }
     /// Same layout with `LLVMRustMCDCParameters`
     #[repr(C)]
@@ -159,13 +160,7 @@ pub mod mcdc {
             Self { tag: ParameterTag::Decision, decision_params, branch_params: Default::default() }
         }
         pub fn branch(branch_params: BranchParameters) -> Self {
-            Self { tag: ParameterTag::Branch, decision_params: Default, branch_params }
-        }
-    }
-
-    impl Default for Parameters {
-        fn default() -> Self {
-            Self::none()
+            Self { tag: ParameterTag::Branch, decision_params: Default::default(), branch_params }
         }
     }
 
@@ -294,7 +289,7 @@ impl CounterMappingRegion {
         Self {
             counter,
             false_counter: Counter::ZERO,
-            mcdc_params: mcdc::Parameters::None,
+            mcdc_params: mcdc::Parameters::none(),
             file_id,
             expanded_file_id: 0,
             start_line,
@@ -317,7 +312,7 @@ impl CounterMappingRegion {
     ) -> Self {
         let (kind, mcdc_params) = match condition_info {
             Some(info) => (RegionKind::MCDCBranchRegion, mcdc::Parameters::branch(info.into())),
-            None => (RegionKind::BranchRegion, Default::default()),
+            None => (RegionKind::BranchRegion, mcdc::Parameters::none()),
         };
         Self {
             counter,
@@ -341,7 +336,7 @@ impl CounterMappingRegion {
         end_line: u32,
         end_col: u32,
     ) -> Self {
-        let mcdc_params = mcdc::Parameters::Decision(decision_info.into());
+        let mcdc_params = mcdc::Parameters::decision(decision_info.into());
 
         Self {
             counter: Counter::ZERO,
@@ -371,7 +366,7 @@ impl CounterMappingRegion {
         Self {
             counter: Counter::ZERO,
             false_counter: Counter::ZERO,
-            mcdc_params: mcdc::Parameters::None,
+            mcdc_params: mcdc::Parameters::none(),
             file_id,
             expanded_file_id,
             start_line,
@@ -395,7 +390,7 @@ impl CounterMappingRegion {
         Self {
             counter: Counter::ZERO,
             false_counter: Counter::ZERO,
-            mcdc_params: mcdc::Parameters::None,
+            mcdc_params: mcdc::Parameters::none(),
             file_id,
             expanded_file_id: 0,
             start_line,
@@ -420,7 +415,7 @@ impl CounterMappingRegion {
         Self {
             counter,
             false_counter: Counter::ZERO,
-            mcdc_params: mcdc::Parameters::None,
+            mcdc_params: mcdc::Parameters::none(),
             file_id,
             expanded_file_id: 0,
             start_line,

compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

@@ -192,7 +192,7 @@ fn ensure_mcdc_parameters<'ll, 'tcx>(
     if cx.mcdc_condition_bitmap_map.borrow().contains_key(&instance) {
         return;
     }
-    
+
     let fn_name = bx.get_pgo_func_name_var(instance);
     let hash = bx.const_u64(function_coverage_info.function_source_hash);
     let bitmap_bytes = bx.const_u32(function_coverage_info.mcdc_bitmap_bytes);

compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp

@@ -66,7 +66,7 @@ fromRust(LLVMRustCounterMappingRegionKind Kind) {
   report_fatal_error("Bad LLVMRustCounterMappingRegionKind!");
 }
 
-enum class LLVMRustMCDCParametersTag : uint8_t {
+enum LLVMRustMCDCParametersTag {
   None = 0,
   Decision = 1,
   Branch = 2,
@@ -102,40 +102,40 @@ fromRust(LLVMRustMCDCParameters Params) {
     return parameter;
   case LLVMRustMCDCParametersTag::Decision:
     parameter.BitmapIdx =
-        static_cast<unsigned>(Params.Payload.DecisionParameters.BitmapIdx),
+        static_cast<unsigned>(Params.DecisionParameters.BitmapIdx),
     parameter.NumConditions =
-        static_cast<unsigned>(Params.Payload.DecisionParameters.NumConditions);
+        static_cast<unsigned>(Params.DecisionParameters.NumConditions);
     return parameter;
   case LLVMRustMCDCParametersTag::Branch:
     parameter.ID = static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
-        Params.Payload.BranchParameters.ConditionID),
+        Params.BranchParameters.ConditionID),
     parameter.FalseID =
         static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
-            Params.Payload.BranchParameters.ConditionIDs[0]),
+            Params.BranchParameters.ConditionIDs[0]),
     parameter.TrueID =
         static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
-            Params.Payload.BranchParameters.ConditionIDs[1]);
+            Params.BranchParameters.ConditionIDs[1]);
     return parameter;
   }
   report_fatal_error("Bad LLVMRustMCDCParametersTag!");
 }
 #elif LLVM_VERSION_GE(19, 0)
-static coverage::mcdc::MCDCParameters fromRust(LLVMRustMCDCParameters Params) {
+static coverage::mcdc::Parameters fromRust(LLVMRustMCDCParameters Params) {
   switch (Params.Tag) {
   case LLVMRustMCDCParametersTag::None:
-    return coverage::mcdc::MCDCParameters;
+    return std::monostate();
   case LLVMRustMCDCParametersTag::Decision:
     return coverage::mcdc::DecisionParameters(
-        Params.Payload.DecisionParameters.BitmapIdx,
-        Params.Payload.DecisionParameters.NumConditions);
+        Params.DecisionParameters.BitmapIdx,
+        Params.DecisionParameters.NumConditions);
   case LLVMRustMCDCParametersTag::Branch:
     return coverage::mcdc::BranchParameters(
         static_cast<coverage::mcdc::ConditionID>(
-            Params.Payload.BranchParameters.ConditionID),
-        {static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
-             Params.Payload.BranchParameters.ConditionIDs[0]),
-         static_cast<coverage::CounterMappingRegion::MCDCConditionID>(
-             Params.Payload.BranchParameters.ConditionIDs[1])});
+            Params.BranchParameters.ConditionID),
+        {static_cast<coverage::mcdc::ConditionID>(
+             Params.BranchParameters.ConditionIDs[0]),
+         static_cast<coverage::mcdc::ConditionID>(
+             Params.BranchParameters.ConditionIDs[1])});
   }
   report_fatal_error("Bad LLVMRustMCDCParametersTag!");
 }
@@ -214,7 +214,8 @@ extern "C" void LLVMRustCoverageWriteMappingToBuffer(
            RustMappingRegions, NumMappingRegions)) {
     MappingRegions.emplace_back(
         fromRust(Region.Count), fromRust(Region.FalseCount),
-#if LLVM_VERSION_GE(18, 0)
+#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0)
+        // LLVM 19 may move this argument to last.
         fromRust(Region.MCDCParameters),
 #endif
         Region.FileID, Region.ExpandedFileID, // File IDs, then region info.