about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-07-03 08:20:04 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-07-03 08:20:04 -0700
commit497ecd04585159bf56a6a38315e9adb3877ece04 (patch)
tree171fa9cbd4df873c434bfcf334766f00a0b26070
parent524f4699434bca99a577bd15ddea41f96b864726 (diff)
downloadrust-497ecd04585159bf56a6a38315e9adb3877ece04.tar.gz
rust-497ecd04585159bf56a6a38315e9adb3877ece04.zip
rustc: Fix a call to with_path in trans_unboxing_shim
This was causing lots of ICEs in cargo. I sadly wasn't ever able to reduce the
test case down, but I presume that's because it has to do with node id
collisions which are pretty difficult to turn up...
-rw-r--r--src/librustc/middle/trans/callee.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs
index 116b2e6b421..0cc4a9223d4 100644
--- a/src/librustc/middle/trans/callee.rs
+++ b/src/librustc/middle/trans/callee.rs
@@ -261,7 +261,7 @@ pub fn trans_unboxing_shim(bcx: &Block,
     let function_type =
         ty::mk_bare_fn(tcx, method.fty.clone()).subst(tcx, &substs);
 
-    let function_name = tcx.map.with_path(method_id.node, |path| {
+    let function_name = ty::with_path(tcx, method_id, |path| {
         link::mangle_internal_name_by_path_and_seq(path, "unboxing_shim")
     });
     let llfn = decl_internal_rust_fn(ccx,