---

bors · bors · commit c29e2b6411d7 · 2013-05-17T00:55:29.000-07:00
yaml --- r: 59275 b: refs/heads/incoming c: a3d31f4 h: refs/heads/master i: 59273: 64919ef 59271: 16648a8 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 8badea49b0291d5ea0979a8edfb1ebb4f01b043d
+refs/heads/incoming: a3d31f4b803780452d46c600443f5bbaabec2fda
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/librustc/lib/llvm.rs b/branches/incoming/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;
 
diff --git a/branches/incoming/src/librustc/middle/trans/build.rs b/branches/incoming/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);
     }
 }
 
diff --git a/branches/incoming/src/rustllvm/RustWrapper.cpp b/branches/incoming/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,

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ pub fn AtomicLoad(cx: block, PointerVal: ValueRef, order: AtomicOrdering) -> Val`
`544`	`544`	`return llvm::LLVMGetUndef(ccx.int_type);`
`545`	`545`	`}`
`546`	`546`	`count_insn(cx, "load.atomic");`
`547`		`- return llvm::LLVMBuildAtomicLoad(B(cx), PointerVal, order);`
	`547`	`+ return llvm::LLVMBuildAtomicLoad(B(cx), PointerVal, noname(), order);`
`548`	`548`	`}`
`549`	`549`	`}`
`550`	`550`
Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ extern "C" LLVMValueRef LLVMBuildAtomicLoad(LLVMBuilderRef B,`
`553`	`553`	`li->setVolatile(true);`
`554`	`554`	`li->setAtomic(order);`
`555`	`555`	`li->setAlignment(sizeof(intptr_t));`
`556`		`- return wrap(unwrap(B)->Insert(li));`
	`556`	`+ return wrap(unwrap(B)->Insert(li, Name));`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`extern "C" LLVMValueRef LLVMBuildAtomicStore(LLVMBuilderRef B,`