diff --git a/src/librustc_mir/borrow_check/borrow_set.rs b/src/librustc_mir/borrow_check/borrow_set.rs index ce02a7dc16602..a427b9dd5b7d5 100644 --- a/src/librustc_mir/borrow_check/borrow_set.rs +++ b/src/librustc_mir/borrow_check/borrow_set.rs @@ -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 diff --git a/src/test/run-fail/issue-51345.rs b/src/test/run-fail/issue-51345.rs new file mode 100644 index 0000000000000..9efd08195a1bb --- /dev/null +++ b/src/test/run-fail/issue-51345.rs @@ -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 or the MIT license +// , 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!())); +}