Skip to content

Commit 7efaa9f

Browse files
committed
---
yaml --- r: 14557 b: refs/heads/try c: ed952ec h: refs/heads/master i: 14555: 80fda81 v: v3
1 parent 2207c7b commit 7efaa9f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 7d0958f70ff16ee40649a943306c9b104a5fc829
5+
refs/heads/try: ed952ecf6870e540f7e5e06842c57c60a57b4ffd
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/trans/impl.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@ fn trans_vtable_callee(bcx: block, env: callee_env, dict: ValueRef,
121121
n_method: uint) -> lval_maybe_callee {
122122
let bcx = bcx, ccx = bcx.ccx(), tcx = ccx.tcx;
123123
let method = ty::iface_methods(tcx, iface_id)[n_method];
124+
let method_ty = ty::mk_fn(tcx, method.fty);
124125
let {ty: fty, llty: llfty} =
125-
wrapper_fn_ty(ccx, val_ty(dict), node_id_type(bcx, callee_id),
126-
method.tps);
126+
wrapper_fn_ty(ccx, val_ty(dict), method_ty, method.tps);
127+
// node_id_type(bcx, callee_id),
127128
let vtable = PointerCast(bcx, Load(bcx, GEPi(bcx, dict, [0, 0])),
128129
T_ptr(T_array(T_ptr(llfty), n_method + 1u)));
129130
let mptr = Load(bcx, GEPi(bcx, vtable, [0, n_method as int]));

0 commit comments

Comments
 (0)