Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transition borrowck to visit all **bodies** and not item-likes #39927

Merged
merged 16 commits into from
Mar 3, 2017
Merged

transition borrowck to visit all **bodies** and not item-likes #39927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b3a482c
move the `FreeRegionMap` into `TypeckTables`
nikomatsakis Feb 16, 2017
d885e4c
add `visit_all_bodies_in_krate` helper
nikomatsakis Feb 15, 2017
03e8b26
rewrite `borrowck_fn` to only use the body-id
nikomatsakis Feb 18, 2017
530b92c
remove the borrowck stats
nikomatsakis Feb 18, 2017
a9ec884
make `borrowck_fn` and friends create `bccx`
nikomatsakis Feb 18, 2017
085d71c
remove special-case code for statics and just use `borrowck_fn`
nikomatsakis Feb 18, 2017
cc2e4cd
use `visit_all_bodies_in_krate` for borrowck instead of item-likes
nikomatsakis Feb 18, 2017
3e9bdda
remove `Option` from the `tables` field
nikomatsakis Feb 18, 2017
d79ad36
walk the bodies "in order" by traversing the crate
nikomatsakis Feb 21, 2017
2b5c026
kill the code path for E0388
nikomatsakis Feb 21, 2017
1bb1e16
switch bodies to a btreemap
nikomatsakis Feb 21, 2017
fab202c
store the visit order in the Crate
nikomatsakis Feb 21, 2017
a780fa3
rewrite typeck bodies to iterate over the bodies vector
nikomatsakis Feb 28, 2017
384f044
convert MIR to iterate over the bodies vector
nikomatsakis Feb 28, 2017
f704ef5
simplify check-item-types too
nikomatsakis Feb 28, 2017
d572aa2
fix tests to handle the Typeof bodies
nikomatsakis Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/librustc/dep_graph/dep_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ pub enum DepNode<D: Clone + Debug> {

// Represents the MIR for a fn; also used as the task node for
// things read/modify that MIR.
MirKrate,
Mir(D),

BorrowCheckKrate,
Expand Down Expand Up @@ -212,6 +213,7 @@ impl<D: Clone + Debug> DepNode<D> {
match *self {
Krate => Some(Krate),
BorrowCheckKrate => Some(BorrowCheckKrate),
MirKrate => Some(MirKrate),
TypeckBodiesKrate => Some(TypeckBodiesKrate),
CollectLanguageItems => Some(CollectLanguageItems),
CheckStaticRecursion => Some(CheckStaticRecursion),
Expand Down
26 changes: 5 additions & 21 deletions src/librustc_mir/mir_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ use rustc::ty::{self, Ty, TyCtxt};
use rustc::ty::maps::Providers;
use rustc::ty::subst::Substs;
use rustc::hir;
use rustc::hir::intravisit::{Visitor, NestedVisitorMap};
use syntax::abi::Abi;
use syntax::ast;
use syntax_pos::Span;
Expand All @@ -39,9 +38,11 @@ use std::cell::RefCell;
use std::mem;

pub fn build_mir_for_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) {
tcx.visit_all_item_likes_in_krate(DepNode::Mir, &mut BuildMir {
tcx: tcx
}.as_deep_visitor());
tcx.dep_graph.with_task(DepNode::MirKrate, || {
tcx.visit_all_bodies_in_krate(|body_owner_def_id, _body_id| {
tcx.item_mir(body_owner_def_id);
});
});
}

pub fn provide(providers: &mut Providers) {
Expand Down Expand Up @@ -180,23 +181,6 @@ impl<'a, 'gcx: 'tcx, 'tcx> MutVisitor<'tcx> for GlobalizeMir<'a, 'gcx> {
///////////////////////////////////////////////////////////////////////////
// BuildMir -- walks a crate, looking for fn items and methods to build MIR from
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems this comment refers to the removed BuildMir struct.
Should it also be removed?


struct BuildMir<'a, 'tcx: 'a> {
tcx: TyCtxt<'a, 'tcx, 'tcx>
}

impl<'a, 'tcx> Visitor<'tcx> for BuildMir<'a, 'tcx> {
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
NestedVisitorMap::None
}

fn visit_nested_body(&mut self, body_id: hir::BodyId) {
self.tcx.item_mir(self.tcx.hir.body_owner_def_id(body_id));

let body = self.tcx.hir.body(body_id);
self.visit_body(body);
}
}

fn closure_self_ty<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
closure_expr_id: ast::NodeId,
body_id: hir::BodyId)
Expand Down