mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around llvm 12's memory ordering restrictions.

Browse Source 
Older llvm has the pre-C++17 restriction on success and failure memory
ordering, requiring the former to be at least as strong as the latter.
So, for llvm 12, this upgrades the success ordering to a stronger one if
necessary.
This commit is contained in:
Mara Bos 2022-06-22 14:48:49 +02:00
parent 392d272868
commit 903357604d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_codegen_llvm/src/builder.rs
View File

@ -1064,11 +1064,25 @@ fn atomic_cmpxchg(
dst: &'ll Value, dst: &'ll Value,
cmp: &'ll Value, cmp: &'ll Value,
src: &'ll Value, src: &'ll Value,
order: rustc_codegen_ssa::common::AtomicOrdering, mut order: rustc_codegen_ssa::common::AtomicOrdering,
failure_order: rustc_codegen_ssa::common::AtomicOrdering, failure_order: rustc_codegen_ssa::common::AtomicOrdering,
weak: bool, weak: bool,
) -> &'ll Value { ) -> &'ll Value {
let weak = if weak { llvm::True } else { llvm::False }; let weak = if weak { llvm::True } else { llvm::False };
if llvm_util::get_version() < (13, 0, 0) {
use rustc_codegen_ssa::common::AtomicOrdering::*;
// Older llvm has the pre-C++17 restriction on
// success and failure memory ordering,
// requiring the former to be at least as strong as the latter.
// So, for llvm 12, we upgrade the success ordering to a stronger
// one if necessary.
match (order, failure_order) {
(Relaxed, Acquire) => order = Acquire,
(Release, Acquire) => order = AcquireRelease,
(_, SequentiallyConsistent) => order = SequentiallyConsistent,
_ => {}
}
}
unsafe { unsafe {
llvm::LLVMRustBuildAtomicCmpXchg( llvm::LLVMRustBuildAtomicCmpXchg(
self.llbuilder, self.llbuilder,