---

yaml
---
r: 7223
b: refs/heads/master
c: bb1e797
h: refs/heads/master
i:
  7221: d130f4b
  7219: 6785167
  7215: 9aa8811
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8685a1f7c49292c88eb5c4f76118b1d241303a0a
+refs/heads/master: bb1e79768cbee1d532ade39d72c2c51b99e14e3b

trunk/src/comp/lib/llvm.rs

@@ -278,7 +278,7 @@ native mod llvm {
     fn LLVMMDNodeInContext(C: ContextRef, Vals: *ValueRef, Count: uint) ->
        ValueRef;
     fn LLVMMDNode(Vals: *ValueRef, Count: uint) -> ValueRef;
-    fn LLVMAddNamedMetadataOperand(M: ModuleRef, Str: sbuf, SLen: uint,
+    fn LLVMAddNamedMetadataOperand(M: ModuleRef, Str: sbuf,
                                    Val: ValueRef);
 
     /* Operations on scalar constants */

trunk/src/comp/middle/debuginfo.rs

@@ -73,7 +73,7 @@ fn llnull() -> ValueRef unsafe {
 
 fn add_named_metadata(cx: @crate_ctxt, name: str, val: ValueRef) {
     str::as_buf(name, {|sbuf|
-        llvm::LLVMAddNamedMetadataOperand(cx.llmod, sbuf, str::byte_len(name),
+        llvm::LLVMAddNamedMetadataOperand(cx.llmod, sbuf,
                                           val)
     })
 }

trunk/src/llvm

@@ -1 +1 @@
-Subproject commit 4fb132c803512f06f7cbc38baa6e86280912f800
+Subproject commit d578b905de8f9dece45aab2496a88ac548c67348

trunk/src/rustllvm/RustWrapper.cpp

@@ -172,10 +172,3 @@ extern "C" LLVMTypeRef LLVMMetadataTypeInContext(LLVMContextRef C) {
 extern "C" LLVMTypeRef LLVMMetadataType(void) {
   return LLVMMetadataTypeInContext(LLVMGetGlobalContext());
 }
-
-extern "C" void LLVMAddNamedMetadataOperand(LLVMModuleRef M, const char *Str,
-                                            unsigned SLen, LLVMValueRef Val)
-{
-  NamedMDNode *N = unwrap(M)->getOrInsertNamedMetadata(StringRef(Str, SLen));
-  N->addOperand(unwrap<MDNode>(Val));
-}