bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make dest_needs_borrow iterate instead of recurse

Browse source
This commit is contained in:
Santiago Pastorino 2019-05-27 22:00:44 +02:00
parent 4dbc7f96d6
commit b922e8a97d
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_mir/transform/inline.rs
View file

@ -440,19 +440,22 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> {
// writes to `i`. To prevent this we need to create a temporary // writes to `i`. To prevent this we need to create a temporary
// borrow of the place and pass the destination as `*temp` instead. // borrow of the place and pass the destination as `*temp` instead.
fn dest_needs_borrow(place: &Place<'_>) -> bool { fn dest_needs_borrow(place: &Place<'_>) -> bool {
match *place { place.iterate(|place_base, place_projection| {
Place::Projection(ref p) => { for proj in place_projection {
match p.elem { match proj.elem {
ProjectionElem::Deref | ProjectionElem::Deref |
ProjectionElem::Index(_) => true, ProjectionElem::Index(_) => return true,
_ => dest_needs_borrow(&p.base) _ => {}
} }
} }
match place_base {
// Static variables need a borrow because the callee // Static variables need a borrow because the callee
// might modify the same static. // might modify the same static.
Place::Base(PlaceBase::Static(_)) => true, PlaceBase::Static(_) => true,
_ => false _ => false
} }
})
} }
let dest = if dest_needs_borrow(&destination.0) { let dest = if dest_needs_borrow(&destination.0) {