diff options
| author | bors <bors@rust-lang.org> | 2022-10-12 18:37:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-12 18:37:24 +0000 |
| commit | d8761c02bf02456dc97fc6ac100bff18ce924108 (patch) | |
| tree | 99803ba2d68353bcd8df2864672d573c76e18828 | |
| parent | e7785f6dfc1b1f46ca8c0bfe737d3d8b077fc9c0 (diff) | |
| parent | e67e01b321eab10667fd3b2ae575005d015e0b88 (diff) | |
| download | rust-d8761c02bf02456dc97fc6ac100bff18ce924108.tar.gz rust-d8761c02bf02456dc97fc6ac100bff18ce924108.zip | |
Auto merge of #2592 - RalfJung:rustup, r=RalfJung
Rustup
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/concurrency/weak_memory.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/lib.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index 89a02096550..21e9d5a05df 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -0265a3e93bf1b89d97cae113ed214954d5c35e22 +538f118da1409759ba198acc0ff62070bc6d2dce diff --git a/src/tools/miri/src/concurrency/weak_memory.rs b/src/tools/miri/src/concurrency/weak_memory.rs index 9d7a49c0b43..f2a36572954 100644 --- a/src/tools/miri/src/concurrency/weak_memory.rs +++ b/src/tools/miri/src/concurrency/weak_memory.rs @@ -17,7 +17,7 @@ //! load to the first, as a result of C++20's coherence-ordered before rules. //! //! Rust follows the C++20 memory model (except for the Consume ordering and some operations not performable through C++'s -//! std::atomic<T> API). It is therefore possible for this implementation to generate behaviours never observable when the +//! `std::atomic<T>` API). It is therefore possible for this implementation to generate behaviours never observable when the //! same program is compiled and run natively. Unfortunately, no literature exists at the time of writing which proposes //! an implementable and C++20-compatible relaxed memory model that supports all atomic operation existing in Rust. The closest one is //! A Promising Semantics for Relaxed-Memory Concurrency by Jeehoon Kang et al. (<https://www.cs.tau.ac.il/~orilahav/papers/popl17.pdf>) diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 904118eac78..8de0b0413a4 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -1,5 +1,4 @@ #![feature(rustc_private)] -#![feature(map_first_last)] #![feature(map_try_insert)] #![feature(never_type)] #![feature(try_blocks)] diff --git a/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs b/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs index d9aacdb8aea..f85ad5ae507 100644 --- a/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs +++ b/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs @@ -1,7 +1,7 @@ //@revisions: extern_block definition both #![feature(rustc_attrs, c_unwind)] -#[cfg_attr(any(definition, both), rustc_allocator_nounwind)] +#[cfg_attr(any(definition, both), rustc_nounwind)] #[no_mangle] extern "C-unwind" fn nounwind() { //[definition]~^ ERROR: abnormal termination: the program aborted execution @@ -11,7 +11,7 @@ extern "C-unwind" fn nounwind() { fn main() { extern "C-unwind" { - #[cfg_attr(any(extern_block, both), rustc_allocator_nounwind)] + #[cfg_attr(any(extern_block, both), rustc_nounwind)] fn nounwind(); } unsafe { nounwind() } |