T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3396 from sunfishcode/sunishcode/flags-none

Browse Source 
Use `empty()` instead of `NONE` with rsix flags types.
This commit is contained in:
Chris Fallin
2021-09-30 08:58:58 -07:00
committed by GitHub
parent 49767c7379 e5ebef1b94
commit 8876bd4fa3
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/fiber/src/unix.rs
View File

@@ -60,7 +60,7 @@ impl FiberStack {
let mmap = rsix::io::mmap_anonymous( let mmap = rsix::io::mmap_anonymous(
ptr::null_mut(), ptr::null_mut(),
mmap_len, mmap_len,
rsix::io::ProtFlags::NONE, rsix::io::ProtFlags::empty(),
rsix::io::MapFlags::PRIVATE, rsix::io::MapFlags::PRIVATE,
)?; )?;

2
crates/runtime/src/instance/allocator/pooling/unix.rs
View File

@@ -14,7 +14,7 @@ fn decommit(addr: *mut u8, len: usize, protect: bool) -> Result<()> {
addr as _, addr as _,
len, len,
if protect { if protect {
rsix::io::ProtFlags::NONE rsix::io::ProtFlags::empty()
} else { } else {
rsix::io::ProtFlags::READ | rsix::io::ProtFlags::WRITE rsix::io::ProtFlags::READ | rsix::io::ProtFlags::WRITE
}, },

2
crates/runtime/src/mmap.rs
View File

@@ -190,7 +190,7 @@ impl Mmap {
rsix::io::mmap_anonymous( rsix::io::mmap_anonymous(
ptr::null_mut(), ptr::null_mut(),
mapping_size, mapping_size,
rsix::io::ProtFlags::NONE, rsix::io::ProtFlags::empty(),
rsix::io::MapFlags::PRIVATE, rsix::io::MapFlags::PRIVATE,
) )
.context(format!("mmap failed to allocate {:#x} bytes", mapping_size))? .context(format!("mmap failed to allocate {:#x} bytes", mapping_size))?

2
crates/runtime/src/traphandlers/unix.rs
View File

@@ -297,7 +297,7 @@ pub fn lazy_per_thread_init() -> Result<(), Box<Trap>> {
let ptr = rsix::io::mmap_anonymous( let ptr = rsix::io::mmap_anonymous(
null_mut(), null_mut(),
alloc_size, alloc_size,
rsix::io::ProtFlags::NONE, rsix::io::ProtFlags::empty(),
rsix::io::MapFlags::PRIVATE, rsix::io::MapFlags::PRIVATE,
) )
.map_err(|_| Box::new(Trap::oom()))?; .map_err(|_| Box::new(Trap::oom()))?;

7
tests/all/custom_signal_handler.rs
View File

@@ -60,7 +60,12 @@ mod tests {
// So we can later trigger SIGSEGV by performing a read // So we can later trigger SIGSEGV by performing a read
unsafe { 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); println!("memory: base={:?}, length={}", base, length);

2
tests/all/memory_creator.rs
View File

@@ -24,7 +24,7 @@ mod not_for_windows {
let size = maximum + guard_size; let size = maximum + guard_size;
assert_eq!(size % page_size, 0); // we rely on WASM_PAGE_SIZE being multiple of host page 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"); .expect("mmap failed");
mprotect(mem, minimum, MprotectFlags::READ | MprotectFlags::WRITE) mprotect(mem, minimum, MprotectFlags::READ | MprotectFlags::WRITE)