Rebase fixes

diff --git a/src/librustc_trans/adt.rs b/src/librustc_trans/adt.rs
index a59e2fe506f48da9172a689d5648985c7065433a..49a6fa22c49fe25e0c7062856ec04f8a935a3a89 100644 (file)
--- a/src/librustc_trans/adt.rs
+++ b/src/librustc_trans/adt.rs
@@ -567,10 +567,8 @@ fn struct_field_ptr<'a, 'tcx>(
     ix: usize,
     needs_cast: bool
 ) -> ValueRef {
-    let ccx = bcx.ccx();
     let fty = fields[ix];
     let ccx = bcx.ccx();
-    let ll_fty = type_of::in_memory_type_of(ccx, fty);
 
     let ptr_val = if needs_cast {
         let fields = st.field_index_by_increasing_offset().map(|i| {