bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

coverage: Rename some FFI fields from span to cov_span

Browse source 
This will avoid confusion with actual `Span` spans.
This commit is contained in:
Zalathar 2024-11-24 18:38:18 +11:00
parent 619a272612
commit 87fe7def12
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_codegen_llvm/src/coverageinfo/ffi.rs
View file

@ -156,7 +156,7 @@ impl CoverageSpan {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[repr(C)] #[repr(C)]
pub(crate) struct CodeRegion { pub(crate) struct CodeRegion {
pub(crate) span: CoverageSpan, pub(crate) cov_span: CoverageSpan,
pub(crate) counter: Counter, pub(crate) counter: Counter,
} }
@ -164,7 +164,7 @@ pub(crate) struct CodeRegion {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[repr(C)] #[repr(C)]
pub(crate) struct BranchRegion { pub(crate) struct BranchRegion {
pub(crate) span: CoverageSpan, pub(crate) cov_span: CoverageSpan,
pub(crate) true_counter: Counter, pub(crate) true_counter: Counter,
pub(crate) false_counter: Counter, pub(crate) false_counter: Counter,
} }
@ -173,7 +173,7 @@ pub(crate) struct BranchRegion {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[repr(C)] #[repr(C)]
pub(crate) struct MCDCBranchRegion { pub(crate) struct MCDCBranchRegion {
pub(crate) span: CoverageSpan, pub(crate) cov_span: CoverageSpan,
pub(crate) true_counter: Counter, pub(crate) true_counter: Counter,
pub(crate) false_counter: Counter, pub(crate) false_counter: Counter,
pub(crate) mcdc_branch_params: mcdc::BranchParameters, pub(crate) mcdc_branch_params: mcdc::BranchParameters,
@ -183,6 +183,6 @@ pub(crate) struct MCDCBranchRegion {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[repr(C)] #[repr(C)]
pub(crate) struct MCDCDecisionRegion { pub(crate) struct MCDCDecisionRegion {
pub(crate) span: CoverageSpan, pub(crate) cov_span: CoverageSpan,
pub(crate) mcdc_decision_params: mcdc::DecisionParameters, pub(crate) mcdc_decision_params: mcdc::DecisionParameters,
} }

11
compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
View file

@ -271,21 +271,22 @@ fn encode_mappings_for_function(
// form suitable for FFI. // form suitable for FFI.
for (mapping_kind, region) in counter_regions { for (mapping_kind, region) in counter_regions {
debug!("Adding counter {mapping_kind:?} to map for {region:?}"); debug!("Adding counter {mapping_kind:?} to map for {region:?}");
let span = ffi::CoverageSpan::from_source_region(local_file_id, region); let cov_span = ffi::CoverageSpan::from_source_region(local_file_id, region);
match mapping_kind { match mapping_kind {
MappingKind::Code(term) => { MappingKind::Code(term) => {
code_regions.push(ffi::CodeRegion { span, counter: ffi::Counter::from_term(term) }); code_regions
.push(ffi::CodeRegion { cov_span, counter: ffi::Counter::from_term(term) });
} }
MappingKind::Branch { true_term, false_term } => { MappingKind::Branch { true_term, false_term } => {
branch_regions.push(ffi::BranchRegion { branch_regions.push(ffi::BranchRegion {
span, cov_span,
true_counter: ffi::Counter::from_term(true_term), true_counter: ffi::Counter::from_term(true_term),
false_counter: ffi::Counter::from_term(false_term), false_counter: ffi::Counter::from_term(false_term),
}); });
} }
MappingKind::MCDCBranch { true_term, false_term, mcdc_params } => { MappingKind::MCDCBranch { true_term, false_term, mcdc_params } => {
mcdc_branch_regions.push(ffi::MCDCBranchRegion { mcdc_branch_regions.push(ffi::MCDCBranchRegion {
span, cov_span,
true_counter: ffi::Counter::from_term(true_term), true_counter: ffi::Counter::from_term(true_term),
false_counter: ffi::Counter::from_term(false_term), false_counter: ffi::Counter::from_term(false_term),
mcdc_branch_params: ffi::mcdc::BranchParameters::from(mcdc_params), mcdc_branch_params: ffi::mcdc::BranchParameters::from(mcdc_params),
@ -293,7 +294,7 @@ fn encode_mappings_for_function(
} }
MappingKind::MCDCDecision(mcdc_decision_params) => { MappingKind::MCDCDecision(mcdc_decision_params) => {
mcdc_decision_regions.push(ffi::MCDCDecisionRegion { mcdc_decision_regions.push(ffi::MCDCDecisionRegion {
span, cov_span,
mcdc_decision_params: ffi::mcdc::DecisionParameters::from(mcdc_decision_params), mcdc_decision_params: ffi::mcdc::DecisionParameters::from(mcdc_decision_params),
}); });
} }