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

coverage: Push down and inline bcb_needs_branch_counters

Browse Source 
This lets us avoid creating two copies of the node's branch list.
This commit is contained in:
Zalathar 2023-10-30 21:40:08 +11:00
parent 2cadd31c04
commit 0a17f0697a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/rustc_mir_transform/src/coverage/counters.rs
View File

@ -228,9 +228,7 @@ impl<'a> MakeBcbCounters<'a> {
debug!("{:?} has at least one coverage span. Get or make its counter", bcb); debug!("{:?} has at least one coverage span. Get or make its counter", bcb);
let branching_counter_operand = self.get_or_make_counter_operand(bcb); let branching_counter_operand = self.get_or_make_counter_operand(bcb);
if self.bcb_needs_branch_counters(bcb) { self.make_branch_counters(&traversal, bcb, branching_counter_operand);
self.make_branch_counters(&traversal, bcb, branching_counter_operand);
}
} else { } else {
debug!( debug!(
"{:?} does not have any coverage spans. A counter will only be added if \ "{:?} does not have any coverage spans. A counter will only be added if \
@ -254,6 +252,15 @@ impl<'a> MakeBcbCounters<'a> {
branching_counter_operand: CovTerm, branching_counter_operand: CovTerm,
) { ) {
let branches = self.bcb_branches(from_bcb); let branches = self.bcb_branches(from_bcb);
// If this node doesn't have multiple out-edges, or all of its out-edges
// already have counters, then we don't need to create edge counters.
let needs_branch_counters =
branches.len() > 1 && branches.iter().any(|branch| self.branch_has_no_counter(branch));
if !needs_branch_counters {
return;
}
debug!( debug!(
"{from_bcb:?} has some branch(es) without counters:\n {}", "{from_bcb:?} has some branch(es) without counters:\n {}",
branches branches
@ -510,12 +517,6 @@ impl<'a> MakeBcbCounters<'a> {
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }
fn bcb_needs_branch_counters(&self, bcb: BasicCoverageBlock) -> bool {
let branch_needs_a_counter = |branch: &BcbBranch| self.branch_has_no_counter(branch);
let branches = self.bcb_branches(bcb);
branches.len() > 1 && branches.iter().any(branch_needs_a_counter)
}
fn branch_has_no_counter(&self, branch: &BcbBranch) -> bool { fn branch_has_no_counter(&self, branch: &BcbBranch) -> bool {
self.branch_counter(branch).is_none() self.branch_counter(branch).is_none()
} }