diff --git a/crates/fiber/src/unix.rs b/crates/fiber/src/unix.rs index d8fbff7250..e5f61e613c 100644 --- a/crates/fiber/src/unix.rs +++ b/crates/fiber/src/unix.rs @@ -60,7 +60,7 @@ impl FiberStack { let mmap = rsix::io::mmap_anonymous( ptr::null_mut(), mmap_len, - rsix::io::ProtFlags::NONE, + rsix::io::ProtFlags::empty(), rsix::io::MapFlags::PRIVATE, )?; diff --git a/crates/runtime/src/instance/allocator/pooling/unix.rs b/crates/runtime/src/instance/allocator/pooling/unix.rs index 2fe2321a01..1fea5cbd05 100644 --- a/crates/runtime/src/instance/allocator/pooling/unix.rs +++ b/crates/runtime/src/instance/allocator/pooling/unix.rs @@ -14,7 +14,7 @@ fn decommit(addr: *mut u8, len: usize, protect: bool) -> Result<()> { addr as _, len, if protect { - rsix::io::ProtFlags::NONE + rsix::io::ProtFlags::empty() } else { rsix::io::ProtFlags::READ | rsix::io::ProtFlags::WRITE }, diff --git a/crates/runtime/src/mmap.rs b/crates/runtime/src/mmap.rs index ad26ebd3c9..7f9fd84891 100644 --- a/crates/runtime/src/mmap.rs +++ b/crates/runtime/src/mmap.rs @@ -190,7 +190,7 @@ impl Mmap { rsix::io::mmap_anonymous( ptr::null_mut(), mapping_size, - rsix::io::ProtFlags::NONE, + rsix::io::ProtFlags::empty(), rsix::io::MapFlags::PRIVATE, ) .context(format!("mmap failed to allocate {:#x} bytes", mapping_size))? diff --git a/crates/runtime/src/traphandlers/unix.rs b/crates/runtime/src/traphandlers/unix.rs index a8684a4713..362d51704c 100644 --- a/crates/runtime/src/traphandlers/unix.rs +++ b/crates/runtime/src/traphandlers/unix.rs @@ -297,7 +297,7 @@ pub fn lazy_per_thread_init() -> Result<(), Box> { let ptr = rsix::io::mmap_anonymous( null_mut(), alloc_size, - rsix::io::ProtFlags::NONE, + rsix::io::ProtFlags::empty(), rsix::io::MapFlags::PRIVATE, ) .map_err(|_| Box::new(Trap::oom()))?; diff --git a/tests/all/custom_signal_handler.rs b/tests/all/custom_signal_handler.rs index a5df1466f2..5690c45f57 100644 --- a/tests/all/custom_signal_handler.rs +++ b/tests/all/custom_signal_handler.rs @@ -60,7 +60,12 @@ mod tests { // So we can later trigger SIGSEGV by performing a read unsafe { - mprotect(base as *mut std::ffi::c_void, length, MprotectFlags::NONE).unwrap(); + mprotect( + base as *mut std::ffi::c_void, + length, + MprotectFlags::empty(), + ) + .unwrap(); } println!("memory: base={:?}, length={}", base, length); diff --git a/tests/all/memory_creator.rs b/tests/all/memory_creator.rs index 3eda301045..8bcecd199a 100644 --- a/tests/all/memory_creator.rs +++ b/tests/all/memory_creator.rs @@ -24,7 +24,7 @@ mod not_for_windows { let size = maximum + guard_size; assert_eq!(size % page_size, 0); // we rely on WASM_PAGE_SIZE being multiple of host page size - let mem = mmap_anonymous(null_mut(), size, ProtFlags::NONE, MapFlags::PRIVATE) + let mem = mmap_anonymous(null_mut(), size, ProtFlags::empty(), MapFlags::PRIVATE) .expect("mmap failed"); mprotect(mem, minimum, MprotectFlags::READ | MprotectFlags::WRITE)