user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix normalizing associated types. this brings us up to 52 passing tests!

Browse source
This commit is contained in:
Ralf Jung 2017-07-13 20:23:11 -07:00 • committed by Oliver Schneider
parent bb6e5224da
commit 8e495999df
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_mir/interpret/step.rs
View file

@ -7,9 +7,10 @@ use rustc::hir;
use rustc::mir::visit::{Visitor, LvalueContext};
use rustc::mir;
use rustc::traits::Reveal;
use rustc::ty;
use rustc::ty::{self, TypeFoldable};
use rustc::ty::layout::Layout;
use rustc::ty::subst::{Subst, Substs};
use rustc::infer::TransNormalize;
use error::{EvalResult, EvalError};
use eval_context::{EvalContext, StackPopCleanup};
@ -135,8 +136,16 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
Validate(op, ref lvalues) => {
for operand in lvalues {
// We need to monomorphize ty *without* erasing lifetimes
let ty = operand.ty.subst(self.tcx, self.substs());
// TODO: do we have to self.tcx.normalize_associated_type(&{ty}) ? That however seems to erase lifetimes.
let mut ty = operand.ty.subst(self.tcx, self.substs());
// This is essentially a copy of normalize_associated_type, but without erasure
if ty.has_projection_types() {
let param_env = ty::ParamEnv::empty(Reveal::All);
ty = self.tcx.infer_ctxt().enter(move |infcx| {
ty.trans_normalize(&infcx, param_env)
})
}
// Now we can do validation at this type
let lvalue = self.eval_lvalue(&operand.lval)?;
self.validate(lvalue, ty, ValidationCtx::new(op))?;
}