diff options
| author | Michael Woerister <michaelwoerister@gmail> | 2013-07-19 09:38:36 +0200 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@gmail> | 2013-07-19 11:29:27 +0200 |
| commit | b52eb4a0ffbb5be156a0d71dc37f74c3f92e315e (patch) | |
| tree | d7864351da76a7fc93235710f9de4604bb3805c7 /src | |
| parent | 6aa43c77d4eaf72e673f060ed07bce7f8fc5757d (diff) | |
| download | rust-b52eb4a0ffbb5be156a0d71dc37f74c3f92e315e.tar.gz rust-b52eb4a0ffbb5be156a0d71dc37f74c3f92e315e.zip | |
debuginfo: Fixed some merge fallout
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/trans/debuginfo.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 2 | ||||
| -rw-r--r-- | src/rustllvm/rustllvm.def.in | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index b4e168356b3..0e75e4e85c2 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -1225,8 +1225,8 @@ fn type_metadata(cx: &mut CrateContext, debug!("type_metadata: %?", ty::get(t)); - let sty = copy ty::get(t).sty; - let type_metadata = match sty { + let sty = &ty::get(t).sty; + let type_metadata = match *sty { ty::ty_nil | ty::ty_bot | ty::ty_bool | diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 662a64ea788..9451900091f 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -3694,7 +3694,7 @@ fn struct_ctor_id(cx: ctxt, struct_did: ast::def_id) -> Option<ast::def_id> { // Enum information #[deriving(Clone)] -pub struct VariantInfo_ { +pub struct VariantInfo { args: ~[t], arg_names: Option<~[ast::ident]>, ctor_ty: t, diff --git a/src/rustllvm/rustllvm.def.in b/src/rustllvm/rustllvm.def.in index d5f03ac604b..5b6c3ed2f52 100644 --- a/src/rustllvm/rustllvm.def.in +++ b/src/rustllvm/rustllvm.def.in @@ -608,3 +608,6 @@ LLVMDIBuilderCreateSubroutineType LLVMDIBuilderGetOrCreateArray LLVMDIBuilderInsertDeclareAtEnd LLVMDIBuilderInsertDeclareBefore +LLVMDIBuilderCreateEnumerator +LLVMDIBuilderCreateEnumerationType +LLVMDIBuilderCreateUnionType |