Skip to content

Commit

Permalink
create a region-map for types in generics
Browse files Browse the repository at this point in the history
Fixes #28181
This may fix #28151
  • Loading branch information
Ariel Ben-Yehuda committed Sep 3, 2015
1 parent 1661947 commit 16f75f7
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 9 deletions.
8 changes: 6 additions & 2 deletions src/librustc/middle/region.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,10 @@ impl RegionMaps {
self.intern_code_extent(e, DUMMY_CODE_EXTENT)
}
pub fn lookup_code_extent(&self, e: CodeExtentData) -> CodeExtent {
self.code_extent_interner.borrow()[&e]
match self.code_extent_interner.borrow().get(&e) {
Some(&d) => d,
None => panic!("unknown code extent {:?}", e)
}
}
pub fn node_extent(&self, n: ast::NodeId) -> CodeExtent {
self.lookup_code_extent(CodeExtentData::Misc(n))
Expand Down Expand Up @@ -1069,7 +1072,7 @@ fn resolve_item(visitor: &mut RegionResolutionVisitor, item: &hir::Item) {
}

fn resolve_fn(visitor: &mut RegionResolutionVisitor,
_: FnKind,
kind: FnKind,
decl: &hir::FnDecl,
body: &hir::Block,
sp: Span,
Expand Down Expand Up @@ -1102,6 +1105,7 @@ fn resolve_fn(visitor: &mut RegionResolutionVisitor,
};

visit::walk_fn_decl(visitor, decl);
visit::walk_fn_kind(visitor, kind);

// The body of the every fn is a root scope.
visitor.cx = Context {
Expand Down
17 changes: 10 additions & 7 deletions src/librustc_front/visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -580,13 +580,8 @@ pub fn walk_fn_decl<'v, V: Visitor<'v>>(visitor: &mut V, function_declaration: &
walk_fn_ret_ty(visitor, &function_declaration.output)
}

pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
function_kind: FnKind<'v>,
function_declaration: &'v FnDecl,
function_body: &'v Block,
_span: Span) {
walk_fn_decl(visitor, function_declaration);

pub fn walk_fn_kind<'v, V: Visitor<'v>>(visitor: &mut V,
function_kind: FnKind<'v>) {
match function_kind {
FnKind::ItemFn(_, generics, _, _, _, _) => {
visitor.visit_generics(generics);
Expand All @@ -597,7 +592,15 @@ pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
}
FnKind::Closure(..) => {}
}
}

pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
function_kind: FnKind<'v>,
function_declaration: &'v FnDecl,
function_body: &'v Block,
_span: Span) {
walk_fn_decl(visitor, function_declaration);
walk_fn_kind(visitor, function_kind);
visitor.visit_block(function_body)
}

Expand Down
15 changes: 15 additions & 0 deletions src/test/run-pass/issue-28181.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn bar<F>(f: F) -> usize where F: Fn([usize; 1]) -> usize { f([2]) }

fn main() {
bar(|u| { u[0] });
}

0 comments on commit 16f75f7

Please sign in to comment.