diff options
| author | bors <bors@rust-lang.org> | 2018-11-05 19:29:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-05 19:29:57 +0000 |
| commit | 13dab66a6f6403f4eee092456f7f8f46199c5859 (patch) | |
| tree | d10129bf50eee7c9cc364051329d220258d44ddd /src/libstd | |
| parent | af791bb8f4a9b93c701aa11fd05759d96898cee2 (diff) | |
| parent | 99f7dc451fb7287df18b721bb2df5ab9a71245f3 (diff) | |
| download | rust-13dab66a6f6403f4eee092456f7f8f46199c5859.tar.gz rust-13dab66a6f6403f4eee092456f7f8f46199c5859.zip | |
Auto merge of #55410 - nagisa:atomic-align, r=pnkfelix
Correct alignment of atomic types and (re)add Atomic{I,U}128
This is a updated https://github.com/rust-lang/rust/pull/53514 to also make atomic types `repr(C)` as per comment in https://github.com/rust-lang/rust/pull/53514#issuecomment-431042767.
Fixes #39590
Closes #53514
r? @pnkfelix
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/panic.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 5c87035d8e9..4bc18a57e92 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -264,6 +264,9 @@ impl RefUnwindSafe for atomic::AtomicI32 {} #[cfg(target_has_atomic = "64")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicI64 {} +#[cfg(all(not(stage0), target_has_atomic = "128"))] +#[unstable(feature = "integer_atomics", issue = "32976")] +impl RefUnwindSafe for atomic::AtomicI128 {} #[cfg(target_has_atomic = "ptr")] #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")] @@ -280,6 +283,9 @@ impl RefUnwindSafe for atomic::AtomicU32 {} #[cfg(target_has_atomic = "64")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicU64 {} +#[cfg(all(not(stage0), target_has_atomic = "128"))] +#[unstable(feature = "integer_atomics", issue = "32976")] +impl RefUnwindSafe for atomic::AtomicU128 {} #[cfg(target_has_atomic = "8")] #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")] |