---

bors · bors · commit e7ede81aa4d5 · 2013-09-18T06:45:53.000-07:00
yaml --- r: 82422 b: refs/heads/auto c: 9e636f1 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 10d26f8daf52ca60b785712682c1962e98954fd9
+refs/heads/auto: 9e636f106d50f948ce90738683fba416bb265796
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/trans/base.rs b/branches/auto/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);`