auto merge of rust-lang#9272 : luqmana/rust/esln, r=catamorphism

bors · bors · commit 9e636f106d50 · 2013-09-18T06:45:53.000-07:00
Fixes rust-lang#9270
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
@@ -2660,7 +2660,7 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
                             foreign::register_foreign_item_fn(ccx, abis, &path, ni)
                         }
                         ast::foreign_item_static(*) => {
-                            let ident = token::ident_to_str(&ni.ident);
+                            let ident = foreign::link_name(ccx, ni);
                             let g = do ident.with_c_str |buf| {
                                 unsafe {
                                     let ty = type_of(ccx, ty);

Original file line number	Diff line number	Diff line change
`@@ -2660,7 +2660,7 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {`
`2660`	`2660`	`foreign::register_foreign_item_fn(ccx, abis, &path, ni)`
`2661`	`2661`	`}`
`2662`	`2662`	`ast::foreign_item_static(*) => {`
`2663`		`- let ident = token::ident_to_str(&ni.ident);`
	`2663`	`+ let ident = foreign::link_name(ccx, ni);`
`2664`	`2664`	`let g = do ident.with_c_str \|buf\| {`
`2665`	`2665`	`unsafe {`
`2666`	`2666`	`let ty = type_of(ccx, ty);`