user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fmt

Browse source
This commit is contained in:
Nia Espera 2025-06-20 22:38:06 +02:00
parent 02df2b11b6
commit 733284fc87
No known key found for this signature in database
GPG key ID: E7A3AAA3B692EAD7
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tools/miri/src/alloc/isolated_alloc.rs
View file

@ -1,4 +1,5 @@
use std::{alloc::Layout, ptr::NonNull};
use std::alloc::Layout;
use std::ptr::NonNull;
use nix::sys::mman;
use rustc_index::bit_set::DenseBitSet;

4
src/tools/miri/src/shims/native_lib.rs
View file

@ -232,7 +232,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
let (ret, maybe_memevents) =
this.call_native_with_args(link_name, dest, code_ptr, libffi_args)?;
if cfg!(target_os = "linux") && let Some(events) = maybe_memevents {
if cfg!(target_os = "linux")
&& let Some(events) = maybe_memevents
{
trace!("Registered FFI events:\n{events:#0x?}");
}

6
src/tools/miri/src/shims/trace/parent.rs
View file

@ -566,11 +566,7 @@ fn handle_segfault(
// Check if we also own the next page, and if so unprotect it in case
// the access spans the page boundary.
let flag = if ch_pages.contains(&page_addr.strict_add(page_size)) {
2
} else {
1
};
let flag = if ch_pages.contains(&page_addr.strict_add(page_size)) { 2 } else { 1 };
ptrace::write(pid, (&raw const PAGE_COUNT).cast_mut().cast(), flag).unwrap();
ptrace::setregs(pid, new_regs).unwrap();