nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-26 22:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

CStore switch FxHashMap to IndexVec

Browse Source
This commit is contained in:
Eh2406 2017-12-27 10:36:52 -05:00
parent 71ed31f240
commit 2c69473222
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/librustc_metadata/cstore.rs
View File

@ -91,7 +91,7 @@ pub struct CrateMetadata {
} }
pub struct CStore { pub struct CStore {
metas: RefCell<FxHashMap<CrateNum, Rc<CrateMetadata>>>, metas: RefCell<IndexVec<CrateNum, Option<Rc<CrateMetadata>>>>,
/// Map from NodeId's of local extern crate statements to crate numbers /// Map from NodeId's of local extern crate statements to crate numbers
extern_mod_crate_map: RefCell<NodeMap<CrateNum>>, extern_mod_crate_map: RefCell<NodeMap<CrateNum>>,
pub metadata_loader: Box<MetadataLoader>, pub metadata_loader: Box<MetadataLoader>,
@ -100,7 +100,7 @@ pub struct CStore {
impl CStore { impl CStore {
pub fn new(metadata_loader: Box<MetadataLoader>) -> CStore { pub fn new(metadata_loader: Box<MetadataLoader>) -> CStore {
CStore { CStore {
metas: RefCell::new(FxHashMap()), metas: RefCell::new(IndexVec::new()),
extern_mod_crate_map: RefCell::new(FxHashMap()), extern_mod_crate_map: RefCell::new(FxHashMap()),
metadata_loader, metadata_loader,
} }
@ -111,18 +111,25 @@ impl CStore {
} }
pub fn get_crate_data(&self, cnum: CrateNum) -> Rc<CrateMetadata> { pub fn get_crate_data(&self, cnum: CrateNum) -> Rc<CrateMetadata> {
self.metas.borrow().get(&cnum).unwrap().clone() self.metas.borrow()[cnum].clone().unwrap()
} }
pub fn set_crate_data(&self, cnum: CrateNum, data: Rc<CrateMetadata>) { pub fn set_crate_data(&self, cnum: CrateNum, data: Rc<CrateMetadata>) {
self.metas.borrow_mut().insert(cnum, data); use rustc_data_structures::indexed_vec::Idx;
let mut met = self.metas.borrow_mut();
while met.len() <= cnum.index() {
met.push(None);
}
met[cnum] = Some(data);
} }
pub fn iter_crate_data<I>(&self, mut i: I) pub fn iter_crate_data<I>(&self, mut i: I)
where I: FnMut(CrateNum, &Rc<CrateMetadata>) where I: FnMut(CrateNum, &Rc<CrateMetadata>)
{ {
for (&k, v) in self.metas.borrow().iter() { for (k, v) in self.metas.borrow().iter_enumerated() {
i(k, v); if let &Some(ref v) = v {
i(k, v);
}
} }
} }
@ -150,8 +157,10 @@ impl CStore {
pub fn do_postorder_cnums_untracked(&self) -> Vec<CrateNum> { pub fn do_postorder_cnums_untracked(&self) -> Vec<CrateNum> {
let mut ordering = Vec::new(); let mut ordering = Vec::new();
for (&num, _) in self.metas.borrow().iter() { for (num, v) in self.metas.borrow().iter_enumerated() {
self.push_dependencies_in_postorder(&mut ordering, num); if let &Some(_) = v {
self.push_dependencies_in_postorder(&mut ordering, num);
}
} }
return ordering return ordering
} }