bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Pass WorkProductMap to build_dep_graph instead of FxIndexMap

Browse source 
Constructing an FxIndexMap is useless work as the iteration order never
matters.
This commit is contained in:
bjorn3 2023-08-13 16:07:41 +00:00
parent 4a6de8e0dd
commit 980143b50c
6 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_interface/src/queries.rs
View file

@ -5,7 +5,6 @@ use crate::{passes, util};
use rustc_ast as ast;
use rustc_codegen_ssa::traits::CodegenBackend;
use rustc_codegen_ssa::CodegenResults;
use rustc_data_structures::fx::FxIndexMap;
use rustc_data_structures::steal::Steal;
use rustc_data_structures::svh::Svh;
use rustc_data_structures::sync::{AppendOnlyIndexVec, Lrc, OnceCell, RwLock, WorkerLocal};
@ -162,15 +161,8 @@ impl<'tcx> Queries<'tcx> {
dep_graph_future
.and_then(|future| {
let sess = self.session();
let (prev_graph, mut prev_work_products) =
let (prev_graph, prev_work_products) =
sess.time("blocked_on_dep_graph_loading", || future.open().open(sess));
// Convert from UnordMap to FxIndexMap by sorting
let prev_work_product_ids =
prev_work_products.items().map(|x| *x.0).into_sorted_stable_ord();
let prev_work_products = prev_work_product_ids
.into_iter()
.map(|x| (x, prev_work_products.remove(&x).unwrap()))
.collect::<FxIndexMap<_, _>>();
rustc_incremental::build_dep_graph(sess, prev_graph, prev_work_products)
})
.unwrap_or_else(DepGraph::new_disabled)