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

rustup

Browse source
This commit is contained in:
Ralf Jung 2018-08-25 21:22:06 +02:00
parent 823837922b
commit 1ba6140891
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/intrinsic.rs
View file

@ -4,7 +4,7 @@ use rustc::ty;
use rustc::mir::interpret::{EvalResult, Scalar, ScalarMaybeUndef};
use rustc_mir::interpret::{
PlaceExtra, PlaceTy, EvalContext, OpTy, Value
PlaceTy, EvalContext, OpTy, Value
};
use super::{ScalarExt, FalibleScalarExt, OperatorEvalContextExt};
@ -293,7 +293,7 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
_ => {
// Do it in memory
let mplace = self.force_allocation(dest)?;
assert_eq!(mplace.extra, PlaceExtra::None);
assert!(mplace.extra.is_none());
self.memory.write_repeat(mplace.ptr, 0, dest.layout.size)?;
}
}
@ -550,7 +550,7 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
_ => {
// Do it in memory
let mplace = self.force_allocation(dest)?;
assert_eq!(mplace.extra, PlaceExtra::None);
assert!(mplace.extra.is_none());
self.memory.mark_definedness(mplace.ptr.to_ptr()?, dest.layout.size, false)?;
}
}

2
src/lib.rs
View file

@ -315,7 +315,7 @@ impl<'mir, 'tcx: 'mir> Machine<'mir, 'tcx> for Evaluator<'tcx> {
) -> EvalResult<'tcx, &'m mut Allocation> {
// Make a copy, use that.
mem.deep_copy_static(id, MiriMemoryKind::MutStatic.into())?;
mem.get_mut(id) // this is recursive, but now we know that `id` is in `alloc_map`
mem.get_mut(id) // this is recursive, but now we know that `id` is in `alloc_map` now
}
fn box_alloc<'a>(