OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feature nll implies two-phase-borrows

Browse Source
This commit is contained in:
Santiago Pastorino 2017-12-19 15:28:13 -03:00 committed by Niko Matsakis
parent 0b2db1e616
commit 2019d69f61
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc/session/mod.rs
View File

@ -443,6 +443,9 @@ impl Session {
pub fn nll_dump_cause(&self) -> bool { pub fn nll_dump_cause(&self) -> bool {
self.opts.debugging_opts.nll_dump_cause self.opts.debugging_opts.nll_dump_cause
} }
pub fn two_phase_borrows(&self) -> bool {
self.features.borrow().nll || self.opts.debugging_opts.two_phase_borrows
}
pub fn emit_end_regions(&self) -> bool { pub fn emit_end_regions(&self) -> bool {
self.opts.debugging_opts.emit_end_regions || self.opts.debugging_opts.emit_end_regions ||
(self.opts.debugging_opts.mir_emit_validate > 0) || (self.opts.debugging_opts.mir_emit_validate > 0) ||

6
src/librustc_mir/borrow_check/mod.rs
View File

@ -774,7 +774,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
(Read(kind), BorrowKind::Unique) | (Read(kind), BorrowKind::Mut) => { (Read(kind), BorrowKind::Unique) | (Read(kind), BorrowKind::Mut) => {
// Reading from mere reservations of mutable-borrows is OK. // Reading from mere reservations of mutable-borrows is OK.
if this.tcx.sess.opts.debugging_opts.two_phase_borrows && index.is_reservation() if this.tcx.sess.two_phase_borrows() && index.is_reservation()
{ {
return Control::Continue; return Control::Continue;
} }
@ -922,7 +922,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
BorrowKind::Shared => (Deep, Read(ReadKind::Borrow(bk))), BorrowKind::Shared => (Deep, Read(ReadKind::Borrow(bk))),
BorrowKind::Unique | BorrowKind::Mut => { BorrowKind::Unique | BorrowKind::Mut => {
let wk = WriteKind::MutableBorrow(bk); let wk = WriteKind::MutableBorrow(bk);
if self.tcx.sess.opts.debugging_opts.two_phase_borrows { if self.tcx.sess.two_phase_borrows() {
(Deep, Reservation(wk)) (Deep, Reservation(wk))
} else { } else {
(Deep, Write(wk)) (Deep, Write(wk))
@ -1112,7 +1112,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
span: Span, span: Span,
flow_state: &Flows<'cx, 'gcx, 'tcx>, flow_state: &Flows<'cx, 'gcx, 'tcx>,
) { ) {
if !self.tcx.sess.opts.debugging_opts.two_phase_borrows { if !self.tcx.sess.two_phase_borrows() {
return; return;
} }

4
src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs
View File

@ -10,7 +10,9 @@
// revisions: lxl nll // revisions: lxl nll
//[lxl]compile-flags: -Z borrowck=mir -Z two-phase-borrows //[lxl]compile-flags: -Z borrowck=mir -Z two-phase-borrows
//[nll]compile-flags: -Z borrowck=mir -Z two-phase-borrows -Z nll //[nll]compile-flags: -Z borrowck=mir
#![cfg_attr(nll, feature(nll))]
fn main() { fn main() {
let mut a = 0; let mut a = 0;