From 497ecd04585159bf56a6a38315e9adb3877ece04 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 3 Jul 2014 08:20:04 -0700 Subject: [PATCH] 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... --- src/librustc/middle/trans/callee.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,