Skip to content

fix Miri #60780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2019
Merged

fix Miri #60780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf2379
Revert "use SecRandomCopyBytes on macOS in Miri"
RalfJung May 13, 2019
43207ca
update miri
RalfJung May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/libstd/sys/unix/rand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ pub fn hashmap_random_keys() -> (u64, u64) {

#[cfg(all(unix,
not(target_os = "ios"),
not(all(target_os = "macos", miri)),
not(target_os = "openbsd"),
not(target_os = "freebsd"),
not(target_os = "fuchsia")))]
Expand Down Expand Up @@ -107,9 +106,7 @@ mod imp {
// once per thread in `hashmap_random_keys`. Therefore `SecRandomCopyBytes` is
// only used on iOS where direct access to `/dev/urandom` is blocked by the
// sandbox.
// HACK: However, we do use this when running in Miri on macOS; intercepting this is much
// easier than intercepting accesses to /dev/urandom.
#[cfg(any(target_os = "ios", all(target_os = "macos", miri)))]
#[cfg(target_os = "ios")]
mod imp {
use crate::io;
use crate::ptr;
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 9 files
+1 −1 rust-version
+6 −9 src/bin/cargo-miri.rs
+2 −2 src/bin/miri-rustc-tests.rs
+7 −7 src/bin/miri.rs
+2 −1 src/fn_call.rs
+4 −4 src/helpers.rs
+2 −1 src/lib.rs
+5 −5 src/stacked_borrows.rs
+3 −5 tests/run-pass/hashmap.rs