diff options
| author | bors <bors@rust-lang.org> | 2023-12-30 07:42:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-30 07:42:19 +0000 |
| commit | ddca5343f2988f49fa407dc1ff43bcf779ea4173 (patch) | |
| tree | 2a132f580177b57a206e23599d6a4c5d5bb9d83e /compiler/rustc_codegen_llvm/src/builder.rs | |
| parent | fe2cfd45055abfde24cb372a311095c105265236 (diff) | |
| parent | 6cf61394119f2452557d5b30f52f9a2474074857 (diff) | |
| download | rust-ddca5343f2988f49fa407dc1ff43bcf779ea4173.tar.gz rust-ddca5343f2988f49fa407dc1ff43bcf779ea4173.zip | |
Auto merge of #118705 - WaffleLapkin:codegen-atomic-exhange-untuple, r=cjgillot
Change `rustc_codegen_ssa`'s `atomic_cmpxchg` interface to return a pair of values Doesn't change much, but a little nicer that way.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/builder.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index 8f60175a603..4e5fe290bb1 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -1072,7 +1072,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { order: rustc_codegen_ssa::common::AtomicOrdering, failure_order: rustc_codegen_ssa::common::AtomicOrdering, weak: bool, - ) -> &'ll Value { + ) -> (&'ll Value, &'ll Value) { let weak = if weak { llvm::True } else { llvm::False }; unsafe { let value = llvm::LLVMBuildAtomicCmpXchg( @@ -1085,7 +1085,9 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { llvm::False, // SingleThreaded ); llvm::LLVMSetWeak(value, weak); - value + let val = self.extract_value(value, 0); + let success = self.extract_value(value, 1); + (val, success) } } fn atomic_rmw( |
