OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce IntoKeyValues trait to prepare for multi-queries

Browse Source 
The idea is that such queries will return `FxHashMap`
This commit is contained in:
Niko Matsakis 2017-04-28 09:41:01 -04:00
parent ecc8ff9199
commit 3d1095c5be
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/librustc/ty/maps.rs
View File

@ -24,8 +24,12 @@ use ty::steal::Steal;
use ty::subst::Substs;
use util::nodemap::{DefIdSet, NodeSet};
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::indexed_vec::IndexVec;
use std::cell::{RefCell, RefMut};
use std::fmt::Debug;
use std::hash::Hash;
use std::iter::{self, Once};
use std::mem;
use std::collections::BTreeMap;
use std::ops::Deref;
@ -33,7 +37,7 @@ use std::rc::Rc;
use syntax_pos::{Span, DUMMY_SP};
use syntax::symbol::Symbol;
trait Key: Clone {
trait Key: Clone + Hash + Eq + Debug {
fn map_crate(&self) -> CrateNum;
fn default_span(&self, tcx: TyCtxt) -> Span;
}
@ -156,6 +160,33 @@ impl<'tcx> Value<'tcx> for ty::SymbolName {
}
}
trait IntoKeyValues<K: Key, V> {
type KeyValues: IntoIterator<Item=(K, V)>;
fn into_key_values(tcx: TyCtxt, key: &K, value: Self) -> Self::KeyValues;
}
impl<K: Key, V> IntoKeyValues<K, V> for V {
type KeyValues = Once<(K, V)>;
fn into_key_values(_: TyCtxt, key: &K, value: Self) -> Self::KeyValues {
iter::once((key.clone(), value))
}
}
impl<K: Key, V> IntoKeyValues<K, V> for FxHashMap<K, V> {
type KeyValues = Self;
fn into_key_values(tcx: TyCtxt, key: &K, value: Self) -> Self {
if !value.contains_key(key) {
span_bug!(key.default_span(tcx),
"multi-generation function for `{:?}` did not generate a value for `{:?}`",
key, key)
}
value
}
}
pub struct CycleError<'a, 'tcx: 'a> {
span: Span,
cycle: RefMut<'a, [(Span, Query<'tcx>)]>,
@ -437,7 +468,14 @@ macro_rules! define_maps {
provider(tcx.global_tcx(), key)
})?;
Ok(f(&tcx.maps.$name.borrow_mut().entry(key).or_insert(result)))
{
let map = &mut *tcx.maps.$name.borrow_mut();
for (k, v) in IntoKeyValues::<$K, $V>::into_key_values(tcx, &key, result) {
map.insert(k, v);
}
}
Ok(f(tcx.maps.$name.borrow().get(&key).expect("value just generated")))
}
pub fn try_get(tcx: TyCtxt<'a, $tcx, 'lcx>, span: Span, key: $K)