OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make move_path_for iterate instead of recurse

Browse Source
This commit is contained in:
Santiago Pastorino 2019-05-24 00:52:10 +02:00
parent a0700d062e
commit 294dc18208
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/librustc_mir/dataflow/move_paths/builder.rs
View File

@ -95,13 +95,15 @@ impl<'b, 'a, 'gcx, 'tcx> Gatherer<'b, 'a, 'gcx, 'tcx> {
-> Result<MovePathIndex, MoveError<'tcx>> -> Result<MovePathIndex, MoveError<'tcx>>
{ {
debug!("lookup({:?})", place); debug!("lookup({:?})", place);
match *place { place.iterate(|place_base, place_projection| {
Place::Base(PlaceBase::Local(local)) => Ok(self.builder.data.rev_lookup.locals[local]), let mut base = match place_base {
Place::Base(PlaceBase::Static(..)) => { PlaceBase::Local(local) => self.builder.data.rev_lookup.locals[*local],
Err(MoveError::cannot_move_out_of(self.loc, Static)) PlaceBase::Static(..) => {
} return Err(MoveError::cannot_move_out_of(self.loc, Static));
Place::Projection(ref proj) => { }
let base = self.move_path_for(&proj.base)?; };
for proj in place_projection {
let mir = self.builder.mir; let mir = self.builder.mir;
let tcx = self.builder.tcx; let tcx = self.builder.tcx;
let place_ty = proj.base.ty(mir, tcx).ty; let place_ty = proj.base.ty(mir, tcx).ty;
@ -109,7 +111,9 @@ impl<'b, 'a, 'gcx, 'tcx> Gatherer<'b, 'a, 'gcx, 'tcx> {
ty::Ref(..) | ty::RawPtr(..) => ty::Ref(..) | ty::RawPtr(..) =>
return Err(MoveError::cannot_move_out_of( return Err(MoveError::cannot_move_out_of(
self.loc, self.loc,
BorrowedContent { target_place: place.clone() })), BorrowedContent {
target_place: Place::Projection(Box::new(proj.clone())),
})),
ty::Adt(adt, _) if adt.has_dtor(tcx) && !adt.is_box() => ty::Adt(adt, _) if adt.has_dtor(tcx) && !adt.is_box() =>
return Err(MoveError::cannot_move_out_of(self.loc, return Err(MoveError::cannot_move_out_of(self.loc,
InteriorOfTypeWithDestructor { InteriorOfTypeWithDestructor {
@ -140,22 +144,31 @@ impl<'b, 'a, 'gcx, 'tcx> Gatherer<'b, 'a, 'gcx, 'tcx> {
}, },
_ => {} _ => {}
}; };
match self.builder.data.rev_lookup.projections.entry((base, proj.elem.lift())) {
Entry::Occupied(ent) => Ok(*ent.get()), base = match self
.builder
.data
.rev_lookup
.projections
.entry((base, proj.elem.lift()))
{
Entry::Occupied(ent) => *ent.get(),
Entry::Vacant(ent) => { Entry::Vacant(ent) => {
let path = MoveDataBuilder::new_move_path( let path = MoveDataBuilder::new_move_path(
&mut self.builder.data.move_paths, &mut self.builder.data.move_paths,
&mut self.builder.data.path_map, &mut self.builder.data.path_map,
&mut self.builder.data.init_path_map, &mut self.builder.data.init_path_map,
Some(base), Some(base),
place.clone() Place::Projection(Box::new(proj.clone())),
); );
ent.insert(path); ent.insert(path);
Ok(path) path
} }
} };
} }
}
Ok(base)
})
} }
fn create_move_path(&mut self, place: &Place<'tcx>) { fn create_move_path(&mut self, place: &Place<'tcx>) {