Skip to content

Commit

Permalink
Auto merge of #889 - RalfJung:rustup, r=RalfJung
Browse files Browse the repository at this point in the history
rustup
  • Loading branch information
bors committed Aug 5, 2019
2 parents 08d1554 + b0cb603 commit a2fb260
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11a51488f03405ea539a9fe84973ee972eaa7b96
4be067558962c004b638e4c6f162d50f7c0c98b6
2 changes: 2 additions & 0 deletions src/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {

const STATIC_KIND: Option<MiriMemoryKind> = Some(MiriMemoryKind::Static);

const CHECK_ALIGN: bool = true;

#[inline(always)]
fn enforce_validity(ecx: &InterpCx<'mir, 'tcx, Self>) -> bool {
ecx.memory().extra.validate
Expand Down

0 comments on commit a2fb260

Please sign in to comment.