rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

debuginfo: Fixed some merge fallout

Browse Source
This commit is contained in:
Michael Woerister
2013-07-19 09:38:36 +02:00
parent 6aa43c77d4
commit b52eb4a0ff
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/middle/trans/debuginfo.rs
View File

@@ -1225,8 +1225,8 @@ fn type_metadata(cx: &mut CrateContext,
debug!("type_metadata: %?", ty::get(t)); debug!("type_metadata: %?", ty::get(t));
let sty = copy ty::get(t).sty; let sty = &ty::get(t).sty;
let type_metadata = match sty { let type_metadata = match *sty {
ty::ty_nil | ty::ty_nil |
ty::ty_bot | ty::ty_bot |
ty::ty_bool | ty::ty_bool |

2
src/librustc/middle/ty.rs
View File

@@ -3694,7 +3694,7 @@ fn struct_ctor_id(cx: ctxt, struct_did: ast::def_id) -> Option<ast::def_id> {
// Enum information // Enum information
#[deriving(Clone)] #[deriving(Clone)]
pub struct VariantInfo_ { pub struct VariantInfo {
args: ~[t], args: ~[t],
arg_names: Option<~[ast::ident]>, arg_names: Option<~[ast::ident]>,
ctor_ty: t, ctor_ty: t,

3
src/rustllvm/rustllvm.def.in
View File

@@ -608,3 +608,6 @@ LLVMDIBuilderCreateSubroutineType
LLVMDIBuilderGetOrCreateArray LLVMDIBuilderGetOrCreateArray
LLVMDIBuilderInsertDeclareAtEnd LLVMDIBuilderInsertDeclareAtEnd
LLVMDIBuilderInsertDeclareBefore LLVMDIBuilderInsertDeclareBefore
LLVMDIBuilderCreateEnumerator
LLVMDIBuilderCreateEnumerationType
LLVMDIBuilderCreateUnionType