Skip to content

Commit

Permalink
Auto merge of rust-lang#113287 - RalfJung:miri-test-libstd, r=JohnTitor
Browse files Browse the repository at this point in the history
enable test_join test in Miri

Miri for quite a while now has a hack to support self-referential generators: non-`Unique` mutable references are exempt from aliasing conditions. So we can run this test now. (It passes.)

Also extend a comment in a Vec test, while I am at it.
  • Loading branch information
bors committed Jul 5, 2023
2 parents 5dac6b3 + e1338cc commit d9c13cd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions library/alloc/tests/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1906,6 +1906,7 @@ fn test_stable_pointers() {
assert_eq!(*v0, 13);

// Smoke test that would fire even outside Miri if an actual relocation happened.
// Also ensures the pointer is still writeable after all this.
*v0 -= 13;
assert_eq!(v[0], 0);
}
Expand Down
1 change: 0 additions & 1 deletion library/core/tests/future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ fn poll_n(val: usize, num: usize) -> PollN {
}

#[test]
#[cfg_attr(miri, ignore)] // self-referential generators do not work with Miri's aliasing checks
fn test_join() {
block_on(async move {
let x = join!(async { 0 }).await;
Expand Down

0 comments on commit d9c13cd

Please sign in to comment.