Mop up merge collision.

Author: graydon

src/rustc/middle/trans/foreign.rs

@@ -910,12 +910,11 @@ fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::foreign_item,
       }
       "get_tydesc" {
         let tp_ty = substs.tys[0];
-        let mut static_ti = none;
-        let lltydesc = get_tydesc(ccx, tp_ty, static_ti);
-        lazily_emit_all_tydesc_glue(ccx, copy static_ti);
+        let static_ti = get_tydesc(ccx, tp_ty);
+        lazily_emit_all_tydesc_glue(ccx, static_ti);
         // FIXME (#2712): change this to T_ptr(ccx.tydesc_ty) when the
         // core::sys copy of the get_tydesc interface dies off.
-        let td = PointerCast(bcx, lltydesc, T_ptr(T_nil()));
+        let td = PointerCast(bcx, static_ti.tydesc, T_ptr(T_nil()));
         Store(bcx, td, fcx.llretptr);
       }
       "init" {

src/rustc/middle/trans/reflect.rs

@@ -43,10 +43,9 @@ impl methods for reflector {
 
     fn c_tydesc(t: ty::t) -> ValueRef {
         let bcx = self.bcx;
-        let mut static_ti = none;
-        let lltydesc = get_tydesc(bcx.ccx(), t, static_ti);
-        lazily_emit_all_tydesc_glue(bcx.ccx(), copy static_ti);
-        PointerCast(bcx, lltydesc, T_ptr(self.tydesc_ty))
+        let static_ti = get_tydesc(bcx.ccx(), t);
+        lazily_emit_all_tydesc_glue(bcx.ccx(), static_ti);
+        PointerCast(bcx, static_ti.tydesc, T_ptr(self.tydesc_ty))
     }
 
     fn c_mt(mt: ty::mt) -> ~[ValueRef] {