Skip to content

Commit 97ab374

Browse files
author
The Miri Cronjob Bot
committed
Merge from rustc
2 parents f2974d7 + c71073f commit 97ab374

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ Definite bugs found:
595595
* [Occasional memory leak in `std::mpsc` channels](https://github.com/rust-lang/rust/issues/121582) (original code in [crossbeam](https://github.com/crossbeam-rs/crossbeam/pull/1084))
596596
* [Weak-memory-induced memory leak in Windows thread-local storage](https://github.com/rust-lang/rust/pull/124281)
597597
* [A bug in the new `RwLock::downgrade` implementation](https://rust-lang.zulipchat.com/#narrow/channel/269128-miri/topic/Miri.20error.20library.20test) (caught by Miri before it landed in the Rust repo)
598-
* [Mockall reading unintialized memory when mocking `std::io::Read::read`, even if all expectations are satisfied](https://github.com/asomers/mockall/issues/647) (caught by Miri running Tokio's test suite)
598+
* [Mockall reading uninitialized memory when mocking `std::io::Read::read`, even if all expectations are satisfied](https://github.com/asomers/mockall/issues/647) (caught by Miri running Tokio's test suite)
599599
* [`ReentrantLock` not correctly dealing with reuse of addresses for TLS storage of different threads](https://github.com/rust-lang/rust/pull/141248)
600600

601601
Violations of [Stacked Borrows] found that are likely bugs (but Stacked Borrows is currently just an experiment):

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ pub const MIRI_DEFAULT_ARGS: &[&str] = &[
173173
"-Zmir-emit-retag",
174174
"-Zmir-preserve-ub",
175175
"-Zmir-opt-level=0",
176-
"-Zmir-enable-passes=-CheckAlignment,-CheckNull",
176+
"-Zmir-enable-passes=-CheckAlignment,-CheckNull,-CheckEnums",
177177
// Deduplicating diagnostics means we miss events when tracking what happens during an
178178
// execution. Let's not do that.
179179
"-Zdeduplicate-diagnostics=no",

tests/fail/dangling_pointers/dangling_pointer_to_raw_pointer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn direct_raw(x: *const (i32, i32)) -> *const i32 {
66

77
// Ensure that if a raw pointer is created via an intermediate
88
// reference, we catch that. (Just in case someone decides to
9-
// desugar this differenly or so.)
9+
// desugar this differently or so.)
1010
fn via_ref(x: *const (i32, i32)) -> *const i32 {
1111
unsafe { &(*x).0 as *const i32 } //~ERROR: dangling pointer
1212
}

0 commit comments

Comments
 (0)