diff options
| author | Ralf Jung <post@ralfj.de> | 2024-09-11 10:03:13 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-09-11 10:03:13 +0200 |
| commit | 7e6ce60ffbbe58cbc38181ad281c99196613bb8b (patch) | |
| tree | 4e12a81b1412673739f09c93265ab140894f7fbb | |
| parent | 19fa141a6d3a74ad1ca4bd47f906746d65b91daa (diff) | |
| download | rust-7e6ce60ffbbe58cbc38181ad281c99196613bb8b.tar.gz rust-7e6ce60ffbbe58cbc38181ad281c99196613bb8b.zip | |
also allow illumos to use mmap for its stack guard
| -rw-r--r-- | src/tools/miri/src/shims/unix/mem.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/miri/src/shims/unix/mem.rs b/src/tools/miri/src/shims/unix/mem.rs index de5a5d0759c..33ed0e26982 100644 --- a/src/tools/miri/src/shims/unix/mem.rs +++ b/src/tools/miri/src/shims/unix/mem.rs @@ -42,10 +42,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { let map_shared = this.eval_libc_i32("MAP_SHARED"); let map_fixed = this.eval_libc_i32("MAP_FIXED"); - // This is a horrible hack, but on MacOS and Solaris the guard page mechanism uses mmap + // This is a horrible hack, but on MacOS and Solarish the guard page mechanism uses mmap // in a way we do not support. We just give it the return value it expects. if this.frame_in_std() - && matches!(&*this.tcx.sess.target.os, "macos" | "solaris") + && matches!(&*this.tcx.sess.target.os, "macos" | "solaris" | "illumos") && (flags & map_fixed) != 0 { return Ok(Scalar::from_maybe_pointer(Pointer::from_addr_invalid(addr), this)); |
