Skip to content

Commit a928e43

Browse files
committed
---
yaml --- r: 4063 b: refs/heads/master c: 5566e0c h: refs/heads/master i: 4061: a4feaad 4059: 0474a12 4055: 9ebe43f 4047: 659cfab 4031: d9f6ed9 v: v3
1 parent 656a76e commit a928e43

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 06a6005447da632200a8b1b8a36dad21c39264df
2+
refs/heads/master: 5566e0c3f1cf00c85cbbc081faa7519be674d3b4

trunk/src/comp/middle/trans.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -6708,13 +6708,10 @@ fn trans_fn(@local_ctxt cx, &span sp, &ast::_fn f, ValueRef llfndecl,
67086708
// vtable slot for method calls that "fall through" to an inner object. A
67096709
// helper function for create_vtbl.
67106710
fn process_fwding_mthd(@local_ctxt cx, &span sp, @ty::method m,
6711-
ty::t self_ty,
67126711
&ast::ty_param[] ty_params,
67136712
ty::t with_obj_ty,
67146713
&ty::t[] additional_field_tys) -> ValueRef {
67156714

6716-
// NB: self_ty (and llself_ty) is the type of the outer object;
6717-
// with_obj_ty is the type of the inner object.
67186715

67196716
// The method m is being called on the outer object, but the outer object
67206717
// doesn't have that method; only the inner object does. So what we have
@@ -7083,9 +7080,7 @@ fn create_vtbl(@local_ctxt cx, &span sp, ty::t self_ty,
70837080
}
70847081
case (some(?t)) {
70857082
llmethods += ~[process_fwding_mthd(
7086-
cx, sp, fm,
7087-
self_ty, ty_params,
7088-
t,
7083+
cx, sp, fm, ty_params, t,
70897084
additional_field_tys)];
70907085
}
70917086
}

0 commit comments

Comments
 (0)