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

impl fold_const for Shifter

Browse Source 
Signed-off-by: Gabriel Smith <ga29smith@gmail.com>
This commit is contained in:
Gabriel Smith 2019-03-01 01:16:04 -05:00 committed by varkor
parent 57d3a5a32d
commit fa394c2283
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/librustc/ty/fold.rs
View File

@ -222,9 +222,9 @@ fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
(self.lt_op)(r)
}
fn fold_const(&mut self, c: &'tcx ty::LazyConst<'tcx>) -> &'tcx ty::LazyConst<'tcx> {
let c = c.super_fold_with(self);
(self.ct_op)(c)
fn fold_const(&mut self, ct: &'tcx ty::LazyConst<'tcx>) -> &'tcx ty::LazyConst<'tcx> {
let ct = ct.super_fold_with(self);
(self.ct_op)(ct)
}
}
@ -747,7 +747,25 @@ fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
}
fn fold_const(&mut self, ct: &'tcx ty::LazyConst<'tcx>) -> &'tcx ty::LazyConst<'tcx> {
ct // FIXME(const_generics)
if let ty::LazyConst::Evaluated(ty::Const {
val: ConstValue::Infer(ty::InferConst::Canonical(debruijn, bound_const)),
ty,
}) = *ct {
if self.amount == 0 || debruijn < self.current_index {
ct
} else {
let debruijn = match self.direction {
Direction::In => debruijn.shifted_in(self.amount),
Direction::Out => {
assert!(debruijn.as_u32() >= self.amount);
debruijn.shifted_out(self.amount)
}
};
self.tcx.mk_const_infer(ty::InferConst::Canonical(debruijn, bound_const), ty)
}
} else {
ct.super_fold_with(self)
}
}
}
@ -842,11 +860,11 @@ fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool {
r.bound_at_or_above_binder(self.outer_index)
}
fn visit_const(&mut self, c: &'tcx ty::LazyConst<'tcx>) -> bool {
fn visit_const(&mut self, ct: &'tcx ty::LazyConst<'tcx>) -> bool {
if let ty::LazyConst::Evaluated(ty::Const {
val: ConstValue::Infer(ty::InferConst::Canonical(debruijn, _)),
..
}) = *c {
}) = *ct {
debruijn >= self.outer_index
} else {
false