Rollup merge of rust-lang#60780 - RalfJung:miri, r=oli-obk

fix Miri This reverts rust-lang#60156, which turned out to be a dead end (see rust-lang#60469). r? @oli-obk
Centril · May 14, 2019 · 020111a · 020111a
2 parents 3b4234a + 43207ca
commit 020111a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs
@@ -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")))]
@@ -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;

diff --git a/src/tools/miri b/src/tools/miri
+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