Skip to content

Commit 0ed1c33

Browse files
committed
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 24539f1.
1 parent af95484 commit 0ed1c33

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,15 @@ LLVMRustBuildAtomicCmpXchg(LLVMBuilderRef B, LLVMValueRef Target,
382382
LLVMValueRef Old, LLVMValueRef Source,
383383
LLVMAtomicOrdering Order,
384384
LLVMAtomicOrdering FailureOrder, LLVMBool Weak) {
385+
#if LLVM_VERSION_GE(12,0)
386+
AtomicCmpXchgInst *ACXI = unwrap(B)->CreateAtomicCmpXchg(
387+
unwrap(Target), unwrap(Old), unwrap(Source), llvm::MaybeAlign(), fromRust(Order),
388+
fromRust(FailureOrder));
389+
#else
385390
AtomicCmpXchgInst *ACXI = unwrap(B)->CreateAtomicCmpXchg(
386391
unwrap(Target), unwrap(Old), unwrap(Source), fromRust(Order),
387392
fromRust(FailureOrder));
393+
#endif
388394
ACXI->setWeak(Weak);
389395
return wrap(ACXI);
390396
}

0 commit comments

Comments
 (0)