bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_metadata: use IndexSet in EncodeContext

Browse source
This commit is contained in:
Josh Stone 2020-08-07 20:44:12 -07:00
parent d3c70b8af5
commit 2fa6e44c8d
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/librustc_metadata/rmeta/encoder.rs
View file

@ -4,7 +4,7 @@ use crate::rmeta::*;
use log::{debug, trace}; use log::{debug, trace};
use rustc_ast::ast; use rustc_ast::ast;
use rustc_data_structures::fingerprint::Fingerprint; use rustc_data_structures::fingerprint::Fingerprint;
use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexSet};
use rustc_data_structures::stable_hasher::StableHasher; use rustc_data_structures::stable_hasher::StableHasher;
use rustc_data_structures::sync::{join, Lrc}; use rustc_data_structures::sync::{join, Lrc};
use rustc_hir as hir; use rustc_hir as hir;
@ -48,8 +48,7 @@ struct EncodeContext<'a, 'tcx> {
type_shorthands: FxHashMap<Ty<'tcx>, usize>, type_shorthands: FxHashMap<Ty<'tcx>, usize>,
predicate_shorthands: FxHashMap<ty::Predicate<'tcx>, usize>, predicate_shorthands: FxHashMap<ty::Predicate<'tcx>, usize>,
interpret_allocs: FxHashMap<interpret::AllocId, usize>, interpret_allocs: FxIndexSet<interpret::AllocId>,
interpret_allocs_inverse: Vec<interpret::AllocId>,
// This is used to speed up Span encoding. // This is used to speed up Span encoding.
// The `usize` is an index into the `MonotonicVec` // The `usize` is an index into the `MonotonicVec`
@ -327,17 +326,7 @@ impl<'a, 'b, 'tcx> SpecializedEncoder<ty::Predicate<'b>> for EncodeContext<'a, '
impl<'a, 'tcx> SpecializedEncoder<interpret::AllocId> for EncodeContext<'a, 'tcx> { impl<'a, 'tcx> SpecializedEncoder<interpret::AllocId> for EncodeContext<'a, 'tcx> {
fn specialized_encode(&mut self, alloc_id: &interpret::AllocId) -> Result<(), Self::Error> { fn specialized_encode(&mut self, alloc_id: &interpret::AllocId) -> Result<(), Self::Error> {
use std::collections::hash_map::Entry; let (index, _) = self.interpret_allocs.insert_full(*alloc_id);
let index = match self.interpret_allocs.entry(*alloc_id) {
Entry::Occupied(e) => *e.get(),
Entry::Vacant(e) => {
let idx = self.interpret_allocs_inverse.len();
self.interpret_allocs_inverse.push(*alloc_id);
e.insert(idx);
idx
}
};
index.encode(self) index.encode(self)
} }
} }
@ -579,7 +568,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
let mut n = 0; let mut n = 0;
trace!("beginning to encode alloc ids"); trace!("beginning to encode alloc ids");
loop { loop {
let new_n = self.interpret_allocs_inverse.len(); let new_n = self.interpret_allocs.len();
// if we have found new ids, serialize those, too // if we have found new ids, serialize those, too
if n == new_n { if n == new_n {
// otherwise, abort // otherwise, abort
@ -587,7 +576,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
} }
trace!("encoding {} further alloc ids", new_n - n); trace!("encoding {} further alloc ids", new_n - n);
for idx in n..new_n { for idx in n..new_n {
let id = self.interpret_allocs_inverse[idx]; let id = self.interpret_allocs[idx];
let pos = self.position() as u32; let pos = self.position() as u32;
interpret_alloc_index.push(pos); interpret_alloc_index.push(pos);
interpret::specialized_encode_alloc_id(self, tcx, id).unwrap(); interpret::specialized_encode_alloc_id(self, tcx, id).unwrap();
@ -2015,7 +2004,6 @@ fn encode_metadata_impl(tcx: TyCtxt<'_>) -> EncodedMetadata {
predicate_shorthands: Default::default(), predicate_shorthands: Default::default(),
source_file_cache: (source_map_files[0].clone(), 0), source_file_cache: (source_map_files[0].clone(), 0),
interpret_allocs: Default::default(), interpret_allocs: Default::default(),
interpret_allocs_inverse: Default::default(),
required_source_files: Some(GrowableBitSet::with_capacity(source_map_files.len())), required_source_files: Some(GrowableBitSet::with_capacity(source_map_files.len())),
is_proc_macro: tcx.sess.crate_types().contains(&CrateType::ProcMacro), is_proc_macro: tcx.sess.crate_types().contains(&CrateType::ProcMacro),
hygiene_ctxt: &hygiene_ctxt, hygiene_ctxt: &hygiene_ctxt,