Skip to content

Commit b1cf0c8

Browse files
committed
coverage: Remove code for making expression copies of BCB counters
Now that coverage statements can have multiple code regions attached to them, this code is never used.
1 parent 86a66c8 commit b1cf0c8

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

compiler/rustc_mir_transform/src/coverage/counters.rs

-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ impl CoverageCounters {
111111
BcbCounter::Expression { id, lhs, op, rhs }
112112
}
113113

114-
pub fn make_identity_counter(&mut self, counter_operand: Operand) -> BcbCounter {
115-
self.make_expression(counter_operand, Op::Add, Operand::Zero)
116-
}
117-
118114
/// Counter IDs start from one and go up.
119115
fn next_counter(&mut self) -> CounterId {
120116
let next = self.next_counter_id;

compiler/rustc_mir_transform/src/coverage/mod.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ use self::spans::CoverageSpans;
1313

1414
use crate::MirPass;
1515

16-
use rustc_data_structures::graph::WithNumNodes;
1716
use rustc_data_structures::sync::Lrc;
18-
use rustc_index::IndexVec;
1917
use rustc_middle::hir;
2018
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
2119
use rustc_middle::mir::coverage::*;
@@ -223,16 +221,10 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> {
223221
let body_span = self.body_span;
224222
let file_name = Symbol::intern(&self.source_file.name.prefer_remapped().to_string_lossy());
225223

226-
let mut bcb_counters = IndexVec::from_elem_n(None, self.basic_coverage_blocks.num_nodes());
227224
for (bcb, spans) in coverage_spans.bcbs_with_coverage_spans() {
228-
let counter_kind = if let Some(&counter_operand) = bcb_counters[bcb].as_ref() {
229-
self.coverage_counters.make_identity_counter(counter_operand)
230-
} else if let Some(counter_kind) = self.coverage_counters.take_bcb_counter(bcb) {
231-
bcb_counters[bcb] = Some(counter_kind.as_operand());
232-
counter_kind
233-
} else {
225+
let counter_kind = self.coverage_counters.take_bcb_counter(bcb).unwrap_or_else(|| {
234226
bug!("Every BasicCoverageBlock should have a Counter or Expression");
235-
};
227+
});
236228

237229
// Convert the coverage spans into a vector of code regions to be
238230
// associated with this BCB's coverage statement.

0 commit comments

Comments
 (0)