diff options
| author | Laurențiu Nicola <lnicola@users.noreply.github.com> | 2025-06-09 12:55:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-09 12:55:47 +0000 |
| commit | f5bfde2303f7b6784224230a8cb8d2bcb743b9f8 (patch) | |
| tree | 1fa465adaaf07355079312d2e1aa3e8594acadc7 /compiler/rustc_codegen_llvm/src/llvm/ffi.rs | |
| parent | 37c8788c5ecadcd2fc55435bcd7a4677884d541e (diff) | |
| parent | 88223c56d9352a14bf4e91d706d68ca3a696bcdf (diff) | |
| download | rust-f5bfde2303f7b6784224230a8cb8d2bcb743b9f8.tar.gz rust-f5bfde2303f7b6784224230a8cb8d2bcb743b9f8.zip | |
Merge pull request #19954 from lnicola/sync-from-rust
minor: Sync from downstream
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm/ffi.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 67a66e6ec79..e27fbf94f34 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -426,14 +426,14 @@ pub(crate) enum AtomicOrdering { } impl AtomicOrdering { - pub(crate) fn from_generic(ao: rustc_codegen_ssa::common::AtomicOrdering) -> Self { - use rustc_codegen_ssa::common::AtomicOrdering as Common; + pub(crate) fn from_generic(ao: rustc_middle::ty::AtomicOrdering) -> Self { + use rustc_middle::ty::AtomicOrdering as Common; match ao { Common::Relaxed => Self::Monotonic, Common::Acquire => Self::Acquire, Common::Release => Self::Release, - Common::AcquireRelease => Self::AcquireRelease, - Common::SequentiallyConsistent => Self::SequentiallyConsistent, + Common::AcqRel => Self::AcquireRelease, + Common::SeqCst => Self::SequentiallyConsistent, } } } |
