diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2023-08-27 20:21:35 +1000 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2023-10-03 13:03:39 +1100 |
| commit | b1cf0c8f1b7ef70836a7842a3287bd7408d20071 (patch) | |
| tree | 6590b85622fa0a31ee0b87af8c121b9610ad3a89 | |
| parent | 86a66c817124170c04035562e9f29cda3138f6ec (diff) | |
| download | rust-b1cf0c8f1b7ef70836a7842a3287bd7408d20071.tar.gz rust-b1cf0c8f1b7ef70836a7842a3287bd7408d20071.zip | |
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.
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/counters.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/mod.rs | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/counters.rs b/compiler/rustc_mir_transform/src/coverage/counters.rs index d6511bf5e6a..b0d0002476c 100644 --- a/compiler/rustc_mir_transform/src/coverage/counters.rs +++ b/compiler/rustc_mir_transform/src/coverage/counters.rs @@ -111,10 +111,6 @@ impl CoverageCounters { BcbCounter::Expression { id, lhs, op, rhs } } - pub fn make_identity_counter(&mut self, counter_operand: Operand) -> BcbCounter { - self.make_expression(counter_operand, Op::Add, Operand::Zero) - } - /// Counter IDs start from one and go up. fn next_counter(&mut self) -> CounterId { let next = self.next_counter_id; diff --git a/compiler/rustc_mir_transform/src/coverage/mod.rs b/compiler/rustc_mir_transform/src/coverage/mod.rs index bedf66c953f..abf13519e9e 100644 --- a/compiler/rustc_mir_transform/src/coverage/mod.rs +++ b/compiler/rustc_mir_transform/src/coverage/mod.rs @@ -13,9 +13,7 @@ use self::spans::CoverageSpans; use crate::MirPass; -use rustc_data_structures::graph::WithNumNodes; use rustc_data_structures::sync::Lrc; -use rustc_index::IndexVec; use rustc_middle::hir; use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags; use rustc_middle::mir::coverage::*; @@ -223,16 +221,10 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> { let body_span = self.body_span; let file_name = Symbol::intern(&self.source_file.name.prefer_remapped().to_string_lossy()); - let mut bcb_counters = IndexVec::from_elem_n(None, self.basic_coverage_blocks.num_nodes()); for (bcb, spans) in coverage_spans.bcbs_with_coverage_spans() { - let counter_kind = if let Some(&counter_operand) = bcb_counters[bcb].as_ref() { - self.coverage_counters.make_identity_counter(counter_operand) - } else if let Some(counter_kind) = self.coverage_counters.take_bcb_counter(bcb) { - bcb_counters[bcb] = Some(counter_kind.as_operand()); - counter_kind - } else { + let counter_kind = self.coverage_counters.take_bcb_counter(bcb).unwrap_or_else(|| { bug!("Every BasicCoverageBlock should have a Counter or Expression"); - }; + }); // Convert the coverage spans into a vector of code regions to be // associated with this BCB's coverage statement. |
