llvm: Switch back to LLVM trunk

rust-lang · Jan 13, 2012 · bb1e797 · bb1e797
1 parent 8685a1f
commit bb1e797
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/src/comp/lib/llvm.rs b/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 */

diff --git a/src/comp/middle/debuginfo.rs b/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)
     })
 }

diff --git a/src/llvm b/src/llvm
diff --git a/src/rustllvm/RustWrapper.cpp b/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));
-}