diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2024-01-05 05:12:56 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2024-01-05 05:12:56 +0000 |
| commit | d11a2bdc1de415c16fd9cbf886aecf22f9cc4a4a (patch) | |
| tree | 4b530857b40a0aaf12b8855289f5a65cd7d8eb73 /compiler/rustc_codegen_llvm/src/builder.rs | |
| parent | 4c4c6a6de31e1018e718fd68616b4fa989457230 (diff) | |
| parent | a59a98024e3fe317e37e218392f5c34e932b2394 (diff) | |
| download | rust-d11a2bdc1de415c16fd9cbf886aecf22f9cc4a4a.tar.gz rust-d11a2bdc1de415c16fd9cbf886aecf22f9cc4a4a.zip | |
Merge from rustc
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( |