From a428b87520c964e10b230446966c18246fb570a7 Mon Sep 17 00:00:00 2001 From: Zalathar Date: Fri, 15 Sep 2023 17:18:43 +1000 Subject: [PATCH] coverage: Replace an unnecessary map with a set This hashmap's values were never used. --- compiler/rustc_mir_transform/src/coverage/debug.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/rustc_mir_transform/src/coverage/debug.rs b/compiler/rustc_mir_transform/src/coverage/debug.rs index 9b27cff1c8f17..bb1f16aa8befa 100644 --- a/compiler/rustc_mir_transform/src/coverage/debug.rs +++ b/compiler/rustc_mir_transform/src/coverage/debug.rs @@ -113,7 +113,7 @@ use std::ops::Deref; use std::sync::OnceLock; use itertools::Itertools; -use rustc_data_structures::fx::FxHashMap; +use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_middle::mir::coverage::*; use rustc_middle::mir::create_dump_file; use rustc_middle::mir::generic_graphviz::GraphvizWriter; @@ -488,7 +488,7 @@ pub(super) struct UsedExpressions { #[derive(Default)] struct UsedExpressionsState { - used_expression_operands: FxHashMap>, + used_expression_operands: FxHashSet, unused_expressions: Vec<(BcbCounter, Option, BasicCoverageBlock)>, } @@ -509,16 +509,16 @@ impl UsedExpressions { pub fn add_expression_operands(&mut self, expression: &BcbCounter) { let Some(state) = &mut self.state else { return }; - if let BcbCounter::Expression { id, lhs, rhs, .. } = *expression { - state.used_expression_operands.entry(lhs).or_insert_with(Vec::new).push(id); - state.used_expression_operands.entry(rhs).or_insert_with(Vec::new).push(id); + if let BcbCounter::Expression { lhs, rhs, .. } = *expression { + state.used_expression_operands.insert(lhs); + state.used_expression_operands.insert(rhs); } } pub fn expression_is_used(&self, expression: &BcbCounter) -> bool { let Some(state) = &self.state else { return false }; - state.used_expression_operands.contains_key(&expression.as_operand()) + state.used_expression_operands.contains(&expression.as_operand()) } pub fn add_unused_expression_if_not_found( @@ -529,7 +529,7 @@ impl UsedExpressions { ) { let Some(state) = &mut self.state else { return }; - if !state.used_expression_operands.contains_key(&expression.as_operand()) { + if !state.used_expression_operands.contains(&expression.as_operand()) { state.unused_expressions.push((expression.clone(), edge_from_bcb, target_bcb)); } }