Skip to content

Commit

Permalink
Auto merge of rust-lang#71794 - RalfJung:miri, r=RalfJung
Browse files Browse the repository at this point in the history 
update Miri

This contains the concurrency support by @vakaras :)

Fixes rust-lang#71729
r? @ghost
Cc @rust-lang/miri
  • Loading branch information
@bors
bors committed May 2, 2020
2 parents 53d3bc0 + 9c4ae74 commit d20113d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 64 files
+9 −5 README.md
+1 −1 rust-version
+2 −1 src/bin/cargo-miri.rs
+3 −3 src/diagnostics.rs
+15 −5 src/eval.rs
+5 −3 src/intptrcast.rs
+6 −0 src/lib.rs
+15 −9 src/machine.rs
+36 −8 src/shims/foreign_items/posix.rs
+7 −0 src/shims/foreign_items/posix/linux.rs
+2 −1 src/shims/foreign_items/posix/macos.rs
+4 −2 src/shims/foreign_items/windows.rs
+1 −0 src/shims/mod.rs
+283 −161 src/shims/sync.rs
+128 −0 src/shims/thread.rs
+221 −77 src/shims/tls.rs
+611 −0 src/thread.rs
+23 −0 tests/compile-fail/concurrency/libc_pthread_create_main_terminate.rs
+24 −0 tests/compile-fail/concurrency/libc_pthread_join_detached.rs
+24 −0 tests/compile-fail/concurrency/libc_pthread_join_joined.rs
+20 −0 tests/compile-fail/concurrency/libc_pthread_join_main.rs
+33 −0 tests/compile-fail/concurrency/libc_pthread_join_multiple.rs
+20 −0 tests/compile-fail/concurrency/libc_pthread_join_self.rs
+3 −0 tests/compile-fail/concurrency/thread-spawn.rs
+1 −1 tests/compile-fail/dangling_pointers/deref-invalid-ptr.rs
+1 −1 tests/compile-fail/dangling_pointers/wild_pointer_deref.rs
+1 −1 tests/compile-fail/function_pointers/cast_int_to_fn_ptr.rs
+1 −1 tests/compile-fail/intrinsics/copy_null.rs
+1 −1 tests/compile-fail/intrinsics/ptr_offset_0_plus_0.rs
+1 −1 tests/compile-fail/intrinsics/ptr_offset_int_plus_int.rs
+1 −1 tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.rs
+1 −1 tests/compile-fail/intrinsics/write_bytes_null.rs
+1 −1 tests/compile-fail/invalid_bool.rs
+4 −3 tests/compile-fail/invalid_char.rs
+1 −1 tests/compile-fail/invalid_enum_discriminant.rs
+1 −1 tests/compile-fail/null_pointer_deref.rs
+1 −1 tests/compile-fail/null_pointer_deref_zst.rs
+1 −1 tests/compile-fail/null_pointer_write.rs
+1 −1 tests/compile-fail/null_pointer_write_zst.rs
+1 −1 tests/compile-fail/stacked_borrows/issue-miri-1050-2.rs
+32 −0 tests/compile-fail/sync/libc_pthread_mutex_deadlock.rs
+32 −0 tests/compile-fail/sync/libc_pthread_mutex_wrong_owner.rs
+22 −3 tests/compile-fail/sync/libc_pthread_rwlock_write_read_deadlock.rs
+13 −0 tests/compile-fail/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.rs
+22 −3 tests/compile-fail/sync/libc_pthread_rwlock_write_write_deadlock.rs
+13 −0 tests/compile-fail/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.rs
+1 −1 tests/compile-fail/validity/execute_memory.rs
+1 −1 tests/compile-fail/validity/fn_ptr_offset.rs
+1 −1 tests/compile-fail/validity/invalid_bool.rs
+1 −1 tests/compile-fail/validity/invalid_char.rs
+1 −1 tests/compile-fail/validity/invalid_enum_discriminant.rs
+1 −1 tests/compile-fail/validity/transmute_through_ptr.rs
+75 −0 tests/run-pass/concurrency/locks.rs
+2 −0 tests/run-pass/concurrency/locks.stderr
+61 −0 tests/run-pass/concurrency/simple.rs
+2 −0 tests/run-pass/concurrency/simple.stderr
+59 −0 tests/run-pass/concurrency/thread_locals.rs
+2 −0 tests/run-pass/concurrency/thread_locals.stderr
+70 −0 tests/run-pass/concurrency/tls_lib_drop.rs
+2 −0 tests/run-pass/concurrency/tls_lib_drop.stderr
+4 −0 tests/run-pass/concurrency/tls_lib_drop.stdout
+25 −0 tests/run-pass/concurrency/tls_lib_drop_single_thread.rs
+2 −0 tests/run-pass/concurrency/tls_lib_drop_single_thread.stderr
+27 −0 tests/run-pass/libc.rs

0 comments on commit d20113d

Please sign in to comment.