Skip to content

Commit 8a0b16a

Browse files
committed
---
yaml --- r: 4274 b: refs/heads/master c: 7efbad6 h: refs/heads/master v: v3
1 parent 46f4084 commit 8a0b16a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 6423cc7b52925dfe0ffaffb9e0319dee922ec48c
2+
refs/heads/master: 7efbad674ab1cdec36af3143d7b64baa5133b067

trunk/src/comp/middle/trans.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6524,10 +6524,14 @@ fn process_fwding_mthd(cx: @local_ctxt, sp: &span, m: @ty::method,
65246524
let mcx: @local_ctxt = @{path: cx.path + ~["method", m.ident] with *cx};
65256525

65266526
// Make up a name for the forwarding function.
6527-
let fn_name: str;
6527+
let fn_name: str = "";
65286528
alt (backwarding_vtbl) {
6529-
none. { fn_name = "forwarding_fn"; }
6530-
some(_) { fn_name = "backwarding_fn"; }
6529+
// NB: If we have a backwarding_vtbl, that *doesn't* mean that we're
6530+
// currently processing a backwarding fn. It's the opposite: it means
6531+
// that we have already processed them, and now we're creating
6532+
// forwarding fns that *use* a vtable full of them.
6533+
none. { fn_name = "backwarding_fn"; }
6534+
some(_) { fn_name = "forwarding_fn"; }
65316535
}
65326536

65336537
let s: str = mangle_internal_name_by_path_and_seq(mcx.ccx, mcx.path,

0 commit comments

Comments
 (0)