mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize shallow_resolve_changed.

Browse Source 
It can be made even more specialized.
This commit is contained in:
Nicholas Nethercote 2019-12-06 15:36:14 +11:00
parent 7dbfb0a8ca
commit f5e68ccd09
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/librustc/infer/mod.rs
View File

@ -1617,38 +1617,40 @@ impl<'a, 'tcx> ShallowResolver<'a, 'tcx> {
// `resolver.shallow_resolve(ty) != ty`, but more efficient. It's always // `resolver.shallow_resolve(ty) != ty`, but more efficient. It's always
// inlined, despite being large, because it has only two call sites that // inlined, despite being large, because it has only two call sites that
// are extremely hot. // are extremely hot.
//
// Note that `typ` is always a `ty::Infer(_)`.
#[inline(always)] #[inline(always)]
pub fn shallow_resolve_changed(&mut self, typ: Ty<'tcx>) -> bool { pub fn shallow_resolve_changed(&self, typ: Ty<'tcx>) -> bool {
match typ.kind { match typ.kind {
ty::Infer(ty::TyVar(v)) => { ty::Infer(ty::TyVar(v)) => {
use self::type_variable::TypeVariableValue; use self::type_variable::TypeVariableValue;
// See the comment in `shallow_resolve()`. // If `inlined_probe` returns a `Known` value it never matches
// `typ`.
match self.infcx.type_variables.borrow_mut().inlined_probe(v) { match self.infcx.type_variables.borrow_mut().inlined_probe(v) {
TypeVariableValue::Known { value: t } => self.fold_ty(t) != typ,
TypeVariableValue::Unknown { .. } => false, TypeVariableValue::Unknown { .. } => false,
TypeVariableValue::Known { .. } => true,
} }
} }
ty::Infer(ty::IntVar(v)) => { ty::Infer(ty::IntVar(v)) => {
match self.infcx.int_unification_table.borrow_mut().inlined_probe_value(v) { // If inlined_probe_value returns a value it's always a
Some(v) => v.to_type(self.infcx.tcx) != typ, // `ty::Int(_)` or `ty::UInt(_)`, which nevers matches a
None => false, // `ty::Infer(_)`.
} self.infcx.int_unification_table.borrow_mut().inlined_probe_value(v).is_some()
} }
ty::Infer(ty::FloatVar(v)) => { ty::Infer(ty::FloatVar(v)) => {
// If inlined_probe_value returns a value it's always a
// `ty::Float(_)`, which nevers matches a `ty::Infer(_)`.
//
// Not `inlined_probe_value(v)` because this call site is colder. // Not `inlined_probe_value(v)` because this call site is colder.
match self.infcx.float_unification_table.borrow_mut().probe_value(v) { self.infcx.float_unification_table.borrow_mut().probe_value(v).is_some()
Some(v) => v.to_type(self.infcx.tcx) != typ,
None => false,
}
} }
_ => false, _ => unreachable!(),
} }
} }
} }
impl<'a, 'tcx> TypeFolder<'tcx> for ShallowResolver<'a, 'tcx> { impl<'a, 'tcx> TypeFolder<'tcx> for ShallowResolver<'a, 'tcx> {