diff options
| author | Augie Fackler <augie@google.com> | 2021-03-16 16:11:09 -0400 |
|---|---|---|
| committer | Augie Fackler <augie@google.com> | 2021-03-16 17:13:13 -0400 |
| commit | 0ed1c33ad95ab3fe983a989a8a85c4ca9052afbf (patch) | |
| tree | c6934cdaa453e2f9f48b9e0b5ffc92664676aa32 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | af954847784a86463af9f3739c20310205c01b69 (diff) | |
| download | rust-0ed1c33ad95ab3fe983a989a8a85c4ca9052afbf.tar.gz rust-0ed1c33ad95ab3fe983a989a8a85c4ca9052afbf.zip | |
llvm-wrapper: add alignment argument to CreateAtomicCmpXchg
As far as I can tell what we've been getting is llvm::MaybeAlign(), so just use that for now. This is required sometime after 24539f1ef2471d07bd87f833cb0288fc0f251f4b.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index a8536595404..9aa6d202cb5 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -382,9 +382,15 @@ LLVMRustBuildAtomicCmpXchg(LLVMBuilderRef B, LLVMValueRef Target, LLVMValueRef Old, LLVMValueRef Source, LLVMAtomicOrdering Order, LLVMAtomicOrdering FailureOrder, LLVMBool Weak) { +#if LLVM_VERSION_GE(12,0) + AtomicCmpXchgInst *ACXI = unwrap(B)->CreateAtomicCmpXchg( + unwrap(Target), unwrap(Old), unwrap(Source), llvm::MaybeAlign(), fromRust(Order), + fromRust(FailureOrder)); +#else AtomicCmpXchgInst *ACXI = unwrap(B)->CreateAtomicCmpXchg( unwrap(Target), unwrap(Old), unwrap(Source), fromRust(Order), fromRust(FailureOrder)); +#endif ACXI->setWeak(Weak); return wrap(ACXI); } |