debuginfo: Fixed some merge fallout

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     |

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,

src/rustllvm/rustllvm.def.in

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