Skip to content

Commit 4e4569c

Browse files
committed
fix build and tests with latest nightly
1 parent 821f29b commit 4e4569c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/operator.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,14 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'a, 'mir, '
161161
if bits == 0 {
162162
// Test if the ptr is in-bounds. Then it cannot be NULL.
163163
// Even dangling pointers cannot be NULL.
164-
if self.memory().check_bounds_ptr_maybe_dead(ptr).is_ok() {
164+
if self.memory().check_bounds_ptr(ptr, InboundsCheck::MaybeDead).is_ok() {
165165
return Ok(false);
166166
}
167167
}
168168

169-
let (alloc_size, alloc_align) = self.memory().get_size_and_align(ptr.alloc_id);
169+
let (alloc_size, alloc_align) = self.memory()
170+
.get_size_and_align(ptr.alloc_id, InboundsCheck::MaybeDead)
171+
.expect("determining size+align of dead ptr cannot fail");
170172

171173
// Case II: Alignment gives it away
172174
if ptr.offset.bytes() % alloc_align.bytes() == 0 {

tests/run-pass/async-fn.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
async_await,
33
await_macro,
44
futures_api,
5-
pin,
65
)]
76

87
use std::{future::Future, pin::Pin, task::Poll};

0 commit comments

Comments
 (0)