Skip to content

Commit 0f0d21c

Browse files
committed
WIP -- trans -- workaround valgrind cleanup failure
1 parent 3ee89f0 commit 0f0d21c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/librustc_trans/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ pub fn trans_external_path<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
958958

959959
pub fn invoke<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
960960
llfn: ValueRef,
961-
llargs: Vec<ValueRef> ,
961+
llargs: &[ValueRef],
962962
fn_ty: Ty<'tcx>,
963963
call_info: Option<NodeInfo>,
964964
// FIXME(15064) is_lang_item is a horrible hack, please remove it

src/librustc_trans/trans/callee.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ pub fn trans_call_inner<'a, 'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
826826
// Invoke the actual rust fn and update bcx/llresult.
827827
let (llret, b) = base::invoke(bcx,
828828
llfn,
829-
llargs,
829+
llargs[],
830830
callee_ty,
831831
call_info,
832832
dest.is_none());

src/librustc_trans/trans/glue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ fn trans_struct_drop<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
291291
let dtor_ty = ty::mk_ctor_fn(bcx.tcx(),
292292
&[get_drop_glue_type(bcx.ccx(), t)],
293293
ty::mk_nil(bcx.tcx()));
294-
let (_, variant_cx) = invoke(variant_cx, dtor_addr, args, dtor_ty, None, false);
294+
let (_, variant_cx) = invoke(variant_cx, dtor_addr, args[], dtor_ty, None, false);
295295

296296
variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope);
297297
variant_cx

0 commit comments

Comments
 (0)