wip

Author: lqd

compiler/rustc_data_structures/src/fx.rs

@@ -1,6 +1,6 @@
 use std::hash::BuildHasherDefault;
 
-pub use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
+pub use rustc_hash::{FxHashMap, FxHashSet, FxHasher, FxBuildHasher};
 
 pub type StdEntry<'a, K, V> = std::collections::hash_map::Entry<'a, K, V>;
 

compiler/rustc_mir_dataflow/src/impls/initialized2.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::fx::FxIndexMap;
+use rustc_data_structures::fx::{FxBuildHasher, FxHashMap};
 use rustc_index::Idx;
 use rustc_index::bit_set::MixedBitSet;
 use rustc_middle::mir::{
@@ -111,7 +111,7 @@ impl MovePathIndexMapper for DefaultMovePathIndexMapper {
 /// of interest.
 pub struct FilteringMovePathIndexMapper {
     /// Map of dense move paths to their associated sparse index.
-    sparse_map: FxIndexMap<MovePathIndex, SparseMovePathIndex>,
+    sparse_map: FxHashMap<MovePathIndex, SparseMovePathIndex>,
 }
 
 impl MovePathIndexMapper for FilteringMovePathIndexMapper {
@@ -133,7 +133,8 @@ impl<'a, 'tcx> MaybeInitializedPlaces2<'a, 'tcx, DefaultMovePathIndexMapper> {
         self,
         interesting_move_paths: &[MovePathIndex],
     ) -> MaybeInitializedPlaces2<'a, 'tcx, FilteringMovePathIndexMapper> {
-        let mut sparse_map = FxIndexMap::default();
+        let mut sparse_map =
+            FxHashMap::with_capacity_and_hasher(interesting_move_paths.len(), FxBuildHasher);
         for (idx, &dense_idx) in interesting_move_paths.iter().enumerate() {
             let sparse_idx = SparseMovePathIndex::from_u32(idx.try_into().unwrap());
             sparse_map.insert(dense_idx, sparse_idx);