user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llvm: Switch back to LLVM trunk

Browse source
This commit is contained in:
Brian Anderson 2012-01-12 14:18:00 -08:00
parent 8685a1f7c4
commit bb1e79768c
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/comp/lib/llvm.rs
View file

@ -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 */

2
src/comp/middle/debuginfo.rs
View file

@ -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)
})
}

2
src/llvm

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

7
src/rustllvm/RustWrapper.cpp
View file

@ -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));
}