From f2b8ab0ad39763674d1290ff2775db39a9b1ceee Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 10 Jul 2012 15:25:58 -0700 Subject: [PATCH] Mop up merge collision. --- src/rustc/middle/trans/foreign.rs | 7 +++---- src/rustc/middle/trans/reflect.rs | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/rustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs index d46779d4fe7..859dd5b2d69 100644 --- a/src/rustc/middle/trans/foreign.rs +++ b/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" { diff --git a/src/rustc/middle/trans/reflect.rs b/src/rustc/middle/trans/reflect.rs index e77b60db39c..06adbf68dac 100644 --- a/src/rustc/middle/trans/reflect.rs +++ b/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] {