bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix building libstd for Miri on macOS

Browse source
This commit is contained in:
Ralf Jung 2020-09-28 10:32:05 +02:00
parent 6369a98ebd
commit dc8414b607
1 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

99
library/std/src/sys/unix/mod.rs
View file

@ -93,60 +93,61 @@ pub fn init() {
reset_sigpipe(); reset_sigpipe();
} }
// In the case when all file descriptors are open, the poll has been cfg_if::cfg_if! {
// observed to perform better than fcntl (on GNU/Linux). if #[cfg(miri)] {
#[cfg(not(any( // The standard fds are always available in Miri.
miri, unsafe fn sanitize_standard_fds() {}
target_os = "emscripten", } else if #[cfg(not(any(
target_os = "fuchsia", target_os = "emscripten",
// The poll on Darwin doesn't set POLLNVAL for closed fds. target_os = "fuchsia",
target_os = "macos", // The poll on Darwin doesn't set POLLNVAL for closed fds.
target_os = "ios", target_os = "macos",
target_os = "redox", target_os = "ios",
)))] target_os = "redox",
unsafe fn sanitize_standard_fds() { )))] {
use crate::sys::os::errno; // In the case when all file descriptors are open, the poll has been
let pfds: &mut [_] = &mut [ // observed to perform better than fcntl (on GNU/Linux).
libc::pollfd { fd: 0, events: 0, revents: 0 }, unsafe fn sanitize_standard_fds() {
libc::pollfd { fd: 1, events: 0, revents: 0 }, use crate::sys::os::errno;
libc::pollfd { fd: 2, events: 0, revents: 0 }, let pfds: &mut [_] = &mut [
]; libc::pollfd { fd: 0, events: 0, revents: 0 },
while libc::poll(pfds.as_mut_ptr(), 3, 0) == -1 { libc::pollfd { fd: 1, events: 0, revents: 0 },
if errno() == libc::EINTR { libc::pollfd { fd: 2, events: 0, revents: 0 },
continue; ];
} while libc::poll(pfds.as_mut_ptr(), 3, 0) == -1 {
libc::abort(); if errno() == libc::EINTR {
} continue;
for pfd in pfds { }
if pfd.revents & libc::POLLNVAL == 0 {
continue;
}
if libc::open("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 {
// If the stream is closed but we failed to reopen it, abort the
// process. Otherwise we wouldn't preserve the safety of
// operations on the corresponding Rust object Stdin, Stdout, or
// Stderr.
libc::abort();
}
}
}
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "redox"))]
unsafe fn sanitize_standard_fds() {
use crate::sys::os::errno;
for fd in 0..3 {
if libc::fcntl(fd, libc::F_GETFD) == -1 && errno() == libc::EBADF {
if libc::open("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 {
libc::abort(); libc::abort();
} }
for pfd in pfds {
if pfd.revents & libc::POLLNVAL == 0 {
continue;
}
if libc::open("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 {
// If the stream is closed but we failed to reopen it, abort the
// process. Otherwise we wouldn't preserve the safety of
// operations on the corresponding Rust object Stdin, Stdout, or
// Stderr.
libc::abort();
}
}
} }
} else if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "redox"))] {
unsafe fn sanitize_standard_fds() {
use crate::sys::os::errno;
for fd in 0..3 {
if libc::fcntl(fd, libc::F_GETFD) == -1 && errno() == libc::EBADF {
if libc::open("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 {
libc::abort();
}
}
}
}
} else {
unsafe fn sanitize_standard_fds() {}
} }
} }
#[cfg(any(
// The standard fds are always available in Miri.
miri,
target_os = "emscripten",
target_os = "fuchsia"))]
unsafe fn sanitize_standard_fds() {}
#[cfg(not(any(target_os = "emscripten", target_os = "fuchsia")))] #[cfg(not(any(target_os = "emscripten", target_os = "fuchsia")))]
unsafe fn reset_sigpipe() { unsafe fn reset_sigpipe() {