bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prepare def_use MutVisitor to have projections interned

Browse source
This commit is contained in:
Santiago Pastorino 2019-10-08 00:24:18 -03:00
parent 39c9ed3ac1
commit 2b2e35bfc3
No known key found for this signature in database
GPG key ID: 88C941CDA1D46432
1 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/librustc_mir/util/def_use.rs
View file

@ -1,6 +1,6 @@
//! Def-use analysis.
use rustc::mir::{Local, Location, Body};
use rustc::mir::{Body, Local, Location, Place, PlaceElem};
use rustc::mir::visit::{PlaceContext, MutVisitor, Visitor};
use rustc_index::vec::IndexVec;
use std::mem;
@ -47,13 +47,13 @@ impl DefUseAnalysis {
&self.info[local]
}
fn mutate_defs_and_uses<F>(&self, local: Local, body: &mut Body<'_>, mut callback: F)
where F: for<'a> FnMut(&'a mut Local,
fn mutate_defs_and_uses<F>(&self, local: Local, body: &mut Body<'_>, callback: F)
where F: for<'a> Fn(&'a Local,
PlaceContext,
Location) {
Location) -> Local {
for place_use in &self.info[local].defs_and_uses {
MutateUseVisitor::new(local,
&mut callback,
&callback,
body).visit_location(body, place_use.location)
}
}
@ -63,7 +63,7 @@ impl DefUseAnalysis {
local: Local,
body: &mut Body<'_>,
new_local: Local) {
self.mutate_defs_and_uses(local, body, |local, _, _| *local = new_local)
self.mutate_defs_and_uses(local, body, |_, _, _| new_local)
}
}
@ -125,7 +125,7 @@ struct MutateUseVisitor<F> {
impl<F> MutateUseVisitor<F> {
fn new(query: Local, callback: F, _: &Body<'_>)
-> MutateUseVisitor<F>
where F: for<'a> FnMut(&'a mut Local, PlaceContext, Location) {
where F: for<'a> Fn(&'a Local, PlaceContext, Location) -> Local {
MutateUseVisitor {
query,
callback,
@ -134,13 +134,31 @@ impl<F> MutateUseVisitor<F> {
}
impl<F> MutVisitor<'_> for MutateUseVisitor<F>
where F: for<'a> FnMut(&'a mut Local, PlaceContext, Location) {
where F: for<'a> Fn(&'a Local, PlaceContext, Location) -> Local {
fn visit_local(&mut self,
local: &mut Local,
context: PlaceContext,
location: Location) {
if *local == self.query {
(self.callback)(local, context, location)
*local = (self.callback)(local, context, location)
}
}
fn visit_place(&mut self,
place: &mut Place<'tcx>,
context: PlaceContext,
location: Location) {
self.visit_place_base(&mut place.base, context, location);
let new_projection: Vec<_> = place.projection.iter().map(|elem|
match elem {
PlaceElem::Index(local) if *local == self.query => {
PlaceElem::Index((self.callback)(&local, context, location))
}
_ => elem.clone(),
}
).collect();
place.projection = new_projection.into_boxed_slice();
}
}