wip

Author: lqd

compiler/rustc_borrowck/src/type_check/liveness/trace.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
+use rustc_data_structures::fx::{FxHashMap, FxIndexMap, FxIndexSet};
 use rustc_index::bit_set::DenseBitSet;
 use rustc_index::interval::IntervalSet;
 use rustc_infer::infer::canonical::QueryRegionConstraints;
@@ -8,7 +8,7 @@ use rustc_middle::traits::query::DropckOutlivesResult;
 use rustc_middle::ty::relate::Relate;
 use rustc_middle::ty::{Ty, TyCtxt, TypeVisitable, TypeVisitableExt};
 use rustc_mir_dataflow::impls::{FilteringMovePathIndexMapper, MaybeInitializedPlaces2};
-use rustc_mir_dataflow::move_paths::{HasMoveData, MoveData, MovePathIndex};
+use rustc_mir_dataflow::move_paths::{HasMoveData, MoveData, MovePathIndex, SparseMovePathIndex};
 use rustc_mir_dataflow::points::{DenseLocationMap, PointIndex};
 use rustc_mir_dataflow::{Analysis, ResultsCursor, on_all_children_bits};
 use rustc_span::{DUMMY_SP, ErrorGuaranteed, Span};
@@ -46,7 +46,8 @@ pub(super) fn trace<'tcx>(
 ) {
     let local_use_map = &LocalUseMap::build(&relevant_live_locals, location_map, typeck.body);
 
-    let mut dense_mpis = smallvec::SmallVec::new();
+    let mut dense_mpis = FxHashMap::default();
+    // let mut dense_mpis = smallvec::SmallVec::new();
     for &local in relevant_live_locals.iter() {
         let Some(mpi) = move_data.rev_lookup.find_local(local) else { unreachable!() };
 
@@ -56,7 +57,10 @@ pub(super) fn trace<'tcx>(
         }
 
         on_all_children_bits(move_data, mpi, |child| {
-            dense_mpis.push(child);
+            // dense_mpis.push(child);
+            let dense_idx = dense_mpis.len();
+            let sparse_idx = SparseMovePathIndex::from_u32(dense_idx.try_into().unwrap());
+            dense_mpis.insert(child, sparse_idx);
         });
     }
 
@@ -105,7 +109,8 @@ struct LivenessContext<'a, 'typeck, 'tcx> {
     /// dropped.
     local_use_map: &'a LocalUseMap,
 
-    dense_mpis: smallvec::SmallVec<[MovePathIndex; 1]>,
+    // dense_mpis: smallvec::SmallVec<[MovePathIndex; 1]>,
+    dense_mpis: FxHashMap<MovePathIndex, SparseMovePathIndex>,
 }
 
 struct DropData<'tcx> {
@@ -566,8 +571,9 @@ impl<'a, 'typeck, 'tcx> LivenessContext<'a, 'typeck, 'tcx> {
             // let mapper = sparse_bitset;
 
             // let timer = std::time::Instant::now();
+            let x = std::mem::take(&mut self.dense_mpis);
             let flow_inits = MaybeInitializedPlaces2::new(tcx, body, self.move_data)
-                .filter_move_paths(&self.dense_mpis)
+                .filter_move_paths(x)
                 // .with_mapper(mapper)
                 .iterate_to_fixpoint(tcx, body, Some("borrowck"))
                 .into_results_cursor(body);

compiler/rustc_mir_dataflow/src/impls/initialized2.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::fx::{FxBuildHasher, FxHashMap};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_index::Idx;
 use rustc_index::bit_set::MixedBitSet;
 use rustc_middle::mir::{
@@ -131,14 +131,16 @@ impl MovePathIndexMapper for FilteringMovePathIndexMapper {
 impl<'a, 'tcx> MaybeInitializedPlaces2<'a, 'tcx, DefaultMovePathIndexMapper> {
     pub fn filter_move_paths(
         self,
-        interesting_move_paths: &[MovePathIndex],
+        // interesting_move_paths: &[MovePathIndex],
+        sparse_map: FxHashMap<MovePathIndex, SparseMovePathIndex>,
     ) -> MaybeInitializedPlaces2<'a, 'tcx, FilteringMovePathIndexMapper> {
-        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);
-        }
+        // use rustc_data_structures::fx::FxBuildHasher;
+        // 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);
+        // }
         let index_mapper = FilteringMovePathIndexMapper { sparse_map };
         MaybeInitializedPlaces2 {
             tcx: self.tcx,