Thanks to visit codestin.com
Credit goes to github.com

Skip to content

In which we start tracking polonius in -Z self-profile #67193

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

Merged
merged 5 commits into from
Dec 11, 2019
Merged

In which we start tracking polonius in -Z self-profile #67193

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6d8fbe
cleanup polonius liveness fact generation
lqd Dec 9, 2019
cd9ec27
cleanup polonius liveness fact generation: mir visitor
lqd Dec 9, 2019
d18bfd6
cleanup polonius liveness fact generation: fix debug! logs
lqd Dec 9, 2019
72579c9
cleanup polonius liveness fact generation: refactor some type names
lqd Dec 9, 2019
e0481d1
add polonius activities to -Z self-profile
lqd Dec 9, 2019
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
Next Next commit
cleanup polonius liveness fact generation 
For the var_uses_region and var_drops_region relations:
- check for all facts existence only once
- remove function only used once
- pull var_uses_region with the other access facts instead of on its own
  • Loading branch information
@lqd
lqd committed Dec 10, 2019
commit e6d8fbede2e492e55283072e426ba81ec90f54ae
36 changes: 14 additions & 22 deletions src/librustc_mir/borrow_check/nll/type_check/liveness/polonius.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use crate::util::liveness::{categorize, DefUse};
use rustc::mir::visit::{MutatingUseContext, PlaceContext, Visitor};
use rustc::mir::{Local, Location, Place, ReadOnlyBodyAndCache};
use rustc::ty::subst::GenericArg;
use rustc::ty::Ty;

use super::TypeChecker;

Expand Down Expand Up @@ -84,17 +83,6 @@ impl Visitor<'tcx> for UseFactsExtractor<'_> {
}
}

fn add_var_uses_regions(typeck: &mut TypeChecker<'_, 'tcx>, local: Local, ty: Ty<'tcx>) {
debug!("add_regions(local={:?}, type={:?})", local, ty);
typeck.tcx().for_each_free_region(&ty, |region| {
let region_vid = typeck.borrowck_context.universal_regions.to_region_vid(region);
debug!("add_regions for region {:?}", region_vid);
if let Some(facts) = typeck.borrowck_context.all_facts {
facts.var_uses_region.push((local, region_vid));
}
});
}

pub(super) fn populate_access_facts(
typeck: &mut TypeChecker<'_, 'tcx>,
body: ReadOnlyBodyAndCache<'_, 'tcx>,
Expand All @@ -118,10 +106,15 @@ pub(super) fn populate_access_facts(
facts.var_drop_used.extend(drop_used.iter().map(|&(local, location)| {
(local, location_table.mid_index(location))
}));
}

for (local, local_decl) in body.local_decls.iter_enumerated() {
add_var_uses_regions(typeck, local, local_decl.ty);
for (local, local_decl) in body.local_decls.iter_enumerated() {
debug!("add var_uses_regions facts - local={:?}, type={:?}", local, local_decl.ty);
let universal_regions = &typeck.borrowck_context.universal_regions;
typeck.infcx.tcx.for_each_free_region(&local_decl.ty, |region| {
let region_vid = universal_regions.to_region_vid(region);
facts.var_uses_region.push((local, region_vid));
});
}
}
}

Expand All @@ -133,12 +126,11 @@ pub(super) fn add_var_drops_regions(
kind: &GenericArg<'tcx>,
) {
debug!("add_var_drops_region(local={:?}, kind={:?}", local, kind);
let tcx = typeck.tcx();

tcx.for_each_free_region(kind, |drop_live_region| {
let region_vid = typeck.borrowck_context.universal_regions.to_region_vid(drop_live_region);
if let Some(facts) = typeck.borrowck_context.all_facts.as_mut() {
if let Some(facts) = typeck.borrowck_context.all_facts.as_mut() {
let universal_regions = &typeck.borrowck_context.universal_regions;
typeck.infcx.tcx.for_each_free_region(kind, |drop_live_region| {
let region_vid = universal_regions.to_region_vid(drop_live_region);
facts.var_drops_region.push((local, region_vid));
};
});
});
}
}