Skip to content

Commit 43864a6

Browse files
michaelwoeristernikomatsakis
authored andcommitted
---
yaml --- r: 273557 b: refs/heads/beta c: 6f60c9e h: refs/heads/master i: 273555: 7e30a14
1 parent 24aca00 commit 43864a6

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: c77f44eeee81021660c3c2cd86540b7449973417
26+
refs/heads/beta: 6f60c9e1fd1a6d7349cede373ac1ffe6d0757b87
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

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