---

yaml
---
r: 232263
b: refs/heads/try
c: f804872
h: refs/heads/master
i:
  232261: a7449fb
  232259: ddd8c91
  232255: 6c34593
v: v3

Author: dotdash

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 1eeaf2065b61cc99f9e5d7f3dd4b77a018ee619f
+refs/heads/try: f804872502587290dcab42eda35301314173cbd7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/glue.rs

@@ -324,7 +324,6 @@ fn trans_struct_drop_flag<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
 
 pub fn get_res_dtor<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
                               did: ast::DefId,
-                              t: Ty<'tcx>,
                               parent_id: ast::DefId,
                               substs: &Substs<'tcx>)
                               -> ValueRef {
@@ -347,11 +346,8 @@ pub fn get_res_dtor<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
         let name = csearch::get_symbol(&ccx.sess().cstore, did);
         let class_ty = tcx.lookup_item_type(parent_id).ty.subst(tcx, substs);
         let llty = type_of_dtor(ccx, class_ty);
-        let dtor_ty = ccx.tcx().mk_ctor_fn(did,
-                                           &[get_drop_glue_type(ccx, t)],
-                                           ccx.tcx().mk_nil());
         foreign::get_extern_fn(ccx, &mut *ccx.externs().borrow_mut(), &name[..], llvm::CCallConv,
-                               llty, dtor_ty)
+                               llty, ccx.tcx().mk_nil())
     }
 }
 
@@ -366,7 +362,7 @@ fn trans_struct_drop<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
     debug!("trans_struct_drop t: {}", t);
 
     // Find and call the actual destructor
-    let dtor_addr = get_res_dtor(bcx.ccx(), dtor_did, t, class_did, substs);
+    let dtor_addr = get_res_dtor(bcx.ccx(), dtor_did, class_did, substs);
 
     // Class dtors have no explicit args, so the params should
     // just consist of the environment (self).