rustc_mir: also promote interior borrows, not just whole temps.

This commit is contained in:
Eduard-Mihai Burtescu 2018-05-10 12:06:51 +03:00
parent b9af400a46
commit d79dee0b62
2 changed files with 43 additions and 2 deletions

View file

@ -737,10 +737,21 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> {
// We might have a candidate for promotion.
let candidate = Candidate::Ref(location);
if self.can_promote() {
// We can only promote direct borrows of temps.
// We can only promote interior borrows of non-drop temps.
let mut place = place;
while let Place::Projection(ref proj) = *place {
if proj.elem == ProjectionElem::Deref {
break;
}
place = &proj.base;
}
if let Place::Local(local) = *place {
if self.mir.local_kind(local) == LocalKind::Temp {
self.promotion_candidates.push(candidate);
if let Some(qualif) = self.temp_qualif[local] {
if !qualif.intersects(Qualif::NEEDS_DROP) {
self.promotion_candidates.push(candidate);
}
}
}
}
}

View file

@ -0,0 +1,30 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: -Z borrowck=compare
const ALL_THE_NUMS: [u32; 1] = [
1
];
#[inline(never)]
fn array(i: usize) -> &'static u32 {
return &ALL_THE_NUMS[i];
}
#[inline(never)]
fn tuple_field() -> &'static u32 {
&(42,).0
}
fn main() {
assert_eq!(tuple_field().to_string(), "42");
// assert_eq!(array(0).to_string(), "1");
}