mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coverage: Rename BcbBranchPair to mappings::BranchPair

Browse Source 
This makes it consistent with the other mapping structs introduced by this PR.
This commit is contained in:
Zalathar 2024-05-02 14:39:24 +10:00
parent 76d8d01604
commit 6968123c3f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_mir_transform/src/coverage/mappings.rs
View File

@ -24,7 +24,7 @@ pub(super) struct CodeMapping {
/// that will be needed for improved branch coverage in the future. /// that will be needed for improved branch coverage in the future.
/// (See <https://github.com/rust-lang/rust/pull/124217>.) /// (See <https://github.com/rust-lang/rust/pull/124217>.)
#[derive(Debug)] #[derive(Debug)]
pub(super) struct BcbBranchPair { pub(super) struct BranchPair {
pub(super) span: Span, pub(super) span: Span,
pub(super) true_bcb: BasicCoverageBlock, pub(super) true_bcb: BasicCoverageBlock,
pub(super) false_bcb: BasicCoverageBlock, pub(super) false_bcb: BasicCoverageBlock,
@ -55,7 +55,7 @@ pub(super) struct MCDCDecision {
pub(super) struct CoverageSpans { pub(super) struct CoverageSpans {
bcb_has_mappings: BitSet<BasicCoverageBlock>, bcb_has_mappings: BitSet<BasicCoverageBlock>,
pub(super) code_mappings: Vec<CodeMapping>, pub(super) code_mappings: Vec<CodeMapping>,
pub(super) branch_pairs: Vec<BcbBranchPair>, pub(super) branch_pairs: Vec<BranchPair>,
test_vector_bitmap_bytes: u32, test_vector_bitmap_bytes: u32,
pub(super) mcdc_branches: Vec<MCDCBranch>, pub(super) mcdc_branches: Vec<MCDCBranch>,
pub(super) mcdc_decisions: Vec<MCDCDecision>, pub(super) mcdc_decisions: Vec<MCDCDecision>,
@ -124,7 +124,7 @@ pub(super) fn generate_coverage_spans(
for &CodeMapping { span: _, bcb } in &code_mappings { for &CodeMapping { span: _, bcb } in &code_mappings {
insert(bcb); insert(bcb);
} }
for &BcbBranchPair { true_bcb, false_bcb, .. } in &branch_pairs { for &BranchPair { true_bcb, false_bcb, .. } in &branch_pairs {
insert(true_bcb); insert(true_bcb);
insert(false_bcb); insert(false_bcb);
} }
@ -183,7 +183,7 @@ pub(super) fn extract_branch_pairs(
mir_body: &mir::Body<'_>, mir_body: &mir::Body<'_>,
hir_info: &ExtractedHirInfo, hir_info: &ExtractedHirInfo,
basic_coverage_blocks: &CoverageGraph, basic_coverage_blocks: &CoverageGraph,
) -> Vec<BcbBranchPair> { ) -> Vec<BranchPair> {
let Some(branch_info) = mir_body.coverage_branch_info.as_deref() else { return vec![] }; let Some(branch_info) = mir_body.coverage_branch_info.as_deref() else { return vec![] };
let block_markers = resolve_block_markers(branch_info, mir_body); let block_markers = resolve_block_markers(branch_info, mir_body);
@ -206,7 +206,7 @@ pub(super) fn extract_branch_pairs(
let true_bcb = bcb_from_marker(true_marker)?; let true_bcb = bcb_from_marker(true_marker)?;
let false_bcb = bcb_from_marker(false_marker)?; let false_bcb = bcb_from_marker(false_marker)?;
Some(BcbBranchPair { span, true_bcb, false_bcb }) Some(BranchPair { span, true_bcb, false_bcb })
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }

4
compiler/rustc_mir_transform/src/coverage/mod.rs
View File

@ -9,7 +9,7 @@ mod tests;
use self::counters::{CounterIncrementSite, CoverageCounters}; use self::counters::{CounterIncrementSite, CoverageCounters};
use self::graph::{BasicCoverageBlock, CoverageGraph}; use self::graph::{BasicCoverageBlock, CoverageGraph};
use self::mappings::{BcbBranchPair, CoverageSpans}; use self::mappings::CoverageSpans;
use crate::MirPass; use crate::MirPass;
@ -159,7 +159,7 @@ fn create_mappings<'tcx>(
)); ));
mappings.extend(coverage_spans.branch_pairs.iter().filter_map( mappings.extend(coverage_spans.branch_pairs.iter().filter_map(
|&BcbBranchPair { span, true_bcb, false_bcb }| { |&mappings::BranchPair { span, true_bcb, false_bcb }| {
let true_term = term_for_bcb(true_bcb); let true_term = term_for_bcb(true_bcb);
let false_term = term_for_bcb(false_bcb); let false_term = term_for_bcb(false_bcb);
let kind = MappingKind::Branch { true_term, false_term }; let kind = MappingKind::Branch { true_term, false_term };