Skip to content

Commit 0ab4e2a

Browse files
michaelwoeristernikomatsakis
authored andcommitted
---
yaml --- r: 276476 b: refs/heads/try c: 6f60c9e h: refs/heads/master
1 parent ef2d90a commit 0ab4e2a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: c77f44eeee81021660c3c2cd86540b7449973417
4+
refs/heads/try: 6f60c9e1fd1a6d7349cede373ac1ffe6d0757b87
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/closure.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use arena::TypedArena;
12-
use back::link::{self, mangle_internal_name_by_path_and_seq};
12+
use back::{link, symbol_names};
1313
use llvm::{ValueRef, get_param, get_params};
1414
use middle::def_id::DefId;
1515
use middle::infer;
@@ -152,8 +152,7 @@ fn get_or_create_closure_declaration<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
152152
return llfn;
153153
}
154154

155-
let path = tcx.def_path(closure_id);
156-
let symbol = mangle_internal_name_by_path_and_seq(path, "closure");
155+
let symbol = symbol_names::exported_name(ccx, &instance);
157156

158157
// Compute the rust-call form of the closure call method.
159158
let infcx = infer::normalizing_infer_ctxt(tcx, &tcx.tables, ProjectionMode::Any);

0 commit comments

Comments
 (0)