fix build and tests with latest nightly

This commit is contained in:
Ralf Jung 2018-12-25 13:26:40 +01:00
parent 821f29bc5d
commit 4e4569cf4b
2 changed files with 4 additions and 3 deletions

View file

@ -161,12 +161,14 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'a, 'mir, '
if bits == 0 {
// Test if the ptr is in-bounds. Then it cannot be NULL.
// Even dangling pointers cannot be NULL.
if self.memory().check_bounds_ptr_maybe_dead(ptr).is_ok() {
if self.memory().check_bounds_ptr(ptr, InboundsCheck::MaybeDead).is_ok() {
return Ok(false);
}
}
let (alloc_size, alloc_align) = self.memory().get_size_and_align(ptr.alloc_id);
let (alloc_size, alloc_align) = self.memory()
.get_size_and_align(ptr.alloc_id, InboundsCheck::MaybeDead)
.expect("determining size+align of dead ptr cannot fail");
// Case II: Alignment gives it away
if ptr.offset.bytes() % alloc_align.bytes() == 0 {

View file

@ -2,7 +2,6 @@
async_await,
await_macro,
futures_api,
pin,
)]
use std::{future::Future, pin::Pin, task::Poll};