user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't treat locals as mutably borrowed after they're dropped

Browse source
This commit is contained in:
Dylan MacKenzie 2019-09-17 16:25:31 -07:00
parent e81297d990
commit 83a3e04ed0
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_mir/dataflow/impls/indirect_mutation.rs
View file

@ -135,18 +135,11 @@ impl<'tcx> Visitor<'tcx> for TransferFunction<'_, '_, 'tcx> {
fn visit_terminator(&mut self, terminator: &mir::Terminator<'tcx>, location: Location) {
self.super_terminator(terminator, location);
match &terminator.kind {
// Drop terminators borrow the location
mir::TerminatorKind::Drop { location: dropped_place, .. } |
mir::TerminatorKind::DropAndReplace { location: dropped_place, .. } => {
match dropped_place.base {
mir::PlaceBase::Local(dropped_local) if !dropped_place.is_indirect()
=> self.trans.gen(dropped_local),
_ => (),
}
}
_ => (),
if let mir::TerminatorKind::Drop { location: _, .. }
| mir::TerminatorKind::DropAndReplace { location: _, .. } = &terminator.kind
{
// Although drop terminators mutably borrow the location being dropped, that borrow
// cannot live beyond the drop terminator because the dropped location is invalidated.
}
}
}