Skip to content

Commit f64cc8e

Browse files
committed
---
yaml --- r: 161124 b: refs/heads/try c: 0f0d21c h: refs/heads/master v: v3
1 parent fe4cc1a commit f64cc8e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
5-
refs/heads/try: 3ee89f0225b8450a6ede55016755a051584347ad
5+
refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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

branches/try/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());

branches/try/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)