---

yaml
---
r: 60422
b: refs/heads/master
c: a3d31f4
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8badea49b0291d5ea0979a8edfb1ebb4f01b043d
+refs/heads/master: a3d31f4b803780452d46c600443f5bbaabec2fda
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/librustc/lib/llvm.rs

@@ -1566,6 +1566,7 @@ pub mod llvm {
         /* Atomic Operations */
         pub unsafe fn LLVMBuildAtomicLoad(B: BuilderRef,
                                           PointerVal: ValueRef,
+                                          Name: *c_char,
                                           Order: AtomicOrdering)
                                        -> ValueRef;
 

trunk/src/librustc/middle/trans/build.rs

@@ -544,7 +544,7 @@ pub fn AtomicLoad(cx: block, PointerVal: ValueRef, order: AtomicOrdering) -> Val
             return llvm::LLVMGetUndef(ccx.int_type);
         }
         count_insn(cx, "load.atomic");
-        return llvm::LLVMBuildAtomicLoad(B(cx), PointerVal, order);
+        return llvm::LLVMBuildAtomicLoad(B(cx), PointerVal, noname(), order);
     }
 }
 

trunk/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,