Ensure that borrows wind up unactivated.
This commit is contained in:
parent
7eba13f451
commit
aeb1682894
2 changed files with 30 additions and 0 deletions
|
|
@ -237,6 +237,14 @@ impl<'a, 'gcx, 'tcx> Visitor<'tcx> for GatherBorrows<'a, 'gcx, 'tcx> {
|
|||
TwoPhaseActivation::NotActivated
|
||||
}
|
||||
_ => {
|
||||
// Double check: We should have found an activation for every pending
|
||||
// activation.
|
||||
assert_eq!(
|
||||
borrow_data.activation_location,
|
||||
TwoPhaseActivation::NotActivated,
|
||||
"never found an activation for this borrow!",
|
||||
);
|
||||
|
||||
self.activation_map
|
||||
.entry(location)
|
||||
.or_insert(Vec::new())
|
||||
|
|
@ -322,6 +330,10 @@ impl<'a, 'gcx, 'tcx> GatherBorrows<'a, 'gcx, 'tcx> {
|
|||
);
|
||||
};
|
||||
|
||||
// Consider the borrow not activated.
|
||||
let borrow_data = &mut self.idx_vec[borrow_index];
|
||||
borrow_data.activation_location = TwoPhaseActivation::NotActivated;
|
||||
|
||||
// Insert `temp` into the list of pending activations. From
|
||||
// now on, we'll be on the lookout for a use of it. Note that
|
||||
// we are guaranteed that this use will come after the
|
||||
|
|
|
|||
18
src/test/run-fail/issue-51345.rs
Normal file
18
src/test/run-fail/issue-51345.rs
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
// Copyright 2012 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.
|
||||
|
||||
// error-pattern: thread 'main' panicked at 'explicit panic'
|
||||
|
||||
#![feature(nll)]
|
||||
|
||||
fn main() {
|
||||
let mut vec = vec![];
|
||||
vec.push((vec.len(), panic!()));
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue