diff options
| author | bors <bors@rust-lang.org> | 2013-05-17 00:55:29 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-17 00:55:29 -0700 |
| commit | a3d31f4b803780452d46c600443f5bbaabec2fda (patch) | |
| tree | 88c0a5c3d531adfd8b05d13ae9fa89f0a3dc6e41 /src/rustllvm/RustWrapper.cpp | |
| parent | 8badea49b0291d5ea0979a8edfb1ebb4f01b043d (diff) | |
| parent | a289dcd18719018ca7051dc03d4a711993008eb2 (diff) | |
| download | rust-a3d31f4b803780452d46c600443f5bbaabec2fda.tar.gz rust-a3d31f4b803780452d46c600443f5bbaabec2fda.zip | |
auto merge of #6550 : Aatch/rust/atomic-load, r=thestinger
This closes #6548 The change makes it match the standard Load signature.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 8c081858d60..9e44abe081c 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -553,7 +553,7 @@ extern "C" LLVMValueRef LLVMBuildAtomicLoad(LLVMBuilderRef B, li->setVolatile(true); li->setAtomic(order); li->setAlignment(sizeof(intptr_t)); - return wrap(unwrap(B)->Insert(li)); + return wrap(unwrap(B)->Insert(li, Name)); } extern "C" LLVMValueRef LLVMBuildAtomicStore(LLVMBuilderRef B, |