bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use closure_base_def_id rather than walking up HIR

Browse source
This commit is contained in:
Niko Matsakis 2017-05-01 11:18:15 -04:00
commit 3438cda788
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc/middle/region.rs
View file

@ -1188,20 +1188,17 @@ impl<'a, 'tcx> Visitor<'tcx> for RegionResolutionVisitor<'a, 'tcx> {
fn region_maps<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, fn_id: DefId)
-> Rc<RegionMaps<'tcx>>
{
let fn_node_id = tcx.hir.as_local_node_id(fn_id)
.expect("fn DefId should be for LOCAL_CRATE");
let node = tcx.hir.get(fn_node_id);
match node {
hir_map::NodeItem(_) | hir_map::NodeTraitItem(_) | hir_map::NodeImplItem(_) => { }
_ => {
let parent_id = tcx.hir.get_parent(fn_node_id);
let parent_def_id = tcx.hir.local_def_id(parent_id);
return tcx.region_maps(parent_def_id);
}
let closure_base_def_id = tcx.closure_base_def_id(fn_id);
if closure_base_def_id != fn_id {
return tcx.region_maps(closure_base_def_id);
}
let mut maps = RegionMaps::new();
let fn_node_id = tcx.hir.as_local_node_id(fn_id)
.expect("fn DefId should be for LOCAL_CRATE");
let node = tcx.hir.get(fn_node_id);
{
let mut visitor = RegionResolutionVisitor {
tcx: tcx,