From f804872502587290dcab42eda35301314173cbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= Date: Sat, 8 Aug 2015 15:32:35 +0200 Subject: [PATCH] Fix the function return type used in get_res_dtor() Instead of the actual return type, we're currently passing the function type to get_extern_fn(). The only reason this doesn't explode is because get_extern_fn() actually doesn't care about the actual return type, just about it being converging or not. --- src/librustc_trans/trans/glue.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/librustc_trans/trans/glue.rs b/src/librustc_trans/trans/glue.rs index 18fedda49193c..1254cf1c296fb 100644 --- a/src/librustc_trans/trans/glue.rs +++ b/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).