about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2016-12-18 17:31:54 -0700
committerMark Simulacrum <mark.simulacrum@gmail.com>2016-12-20 20:03:33 -0700
commitf9f1406eef844db064365bbdb4f7fa3eed8eea6f (patch)
treeaac113b22c9da584bcbfe0681a7fc693a05e106b /src
parent63a0d85457664e9af6c19cc0fb3927a218c31865 (diff)
downloadrust-f9f1406eef844db064365bbdb4f7fa3eed8eea6f.tar.gz
rust-f9f1406eef844db064365bbdb4f7fa3eed8eea6f.zip
Rebase fixes
Diffstat (limited to 'src')
-rw-r--r--src/librustc_trans/adt.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/librustc_trans/adt.rs b/src/librustc_trans/adt.rs
index a59e2fe506f..49a6fa22c49 100644
--- 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| {