---

bors · bors · commit 2f6366615a81 · 2013-09-18T06:45:53.000-07:00
yaml --- r: 83216 b: refs/heads/try c: 9e636f1 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 10d26f8daf52ca60b785712682c1962e98954fd9
+refs/heads/try: 9e636f106d50f948ce90738683fba416bb265796
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/librustc/middle/trans/base.rs b/branches/try/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);`