Finally start down the right path

src/librustc_mir/borrow_check/error_reporting.rs

@@ -18,7 +18,7 @@ use rustc_data_structures::sync::Lrc;
 
 use super::{Context, MirBorrowckCtxt};
 use super::{InitializationRequiringAction, PrefixSet};
-use dataflow::{ActiveBorrows, BorrowData, FlowAtLocation, MovingOutStatements};
+use dataflow::{Borrows, BorrowData, FlowAtLocation, MovingOutStatements};
 use dataflow::move_paths::MovePathIndex;
 use util::borrowck_errors::{BorrowckErrors, Origin};
 
@@ -372,10 +372,10 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
         context: Context,
         borrow: &BorrowData<'tcx>,
         drop_span: Span,
-        borrows: &ActiveBorrows<'cx, 'gcx, 'tcx>,
+        borrows: &Borrows<'cx, 'gcx, 'tcx>
     ) {
         let end_span = borrows.opt_region_end_span(&borrow.region);
-        let scope_tree = borrows.0.scope_tree();
+        let scope_tree = borrows.scope_tree();
         let root_place = self.prefixes(&borrow.borrowed_place, PrefixSet::All)
             .last()
             .unwrap();

src/librustc_mir/borrow_check/flows.rs

@@ -17,13 +17,14 @@ use rustc::mir::{BasicBlock, Location};
 
 use dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 use dataflow::{EverInitializedPlaces, MovingOutStatements};
-use dataflow::{ActiveBorrows, FlowAtLocation, FlowsAtLocation};
+use dataflow::{Borrows};
+use dataflow::{FlowAtLocation, FlowsAtLocation};
 use dataflow::move_paths::HasMoveData;
 use std::fmt;
 
 // (forced to be `pub` due to its use as an associated type below.)
 pub(crate) struct Flows<'b, 'gcx: 'tcx, 'tcx: 'b> {
-    pub borrows: FlowAtLocation<ActiveBorrows<'b, 'gcx, 'tcx>>,
+    pub borrows: FlowAtLocation<Borrows<'b, 'gcx, 'tcx>>,
     pub inits: FlowAtLocation<MaybeInitializedPlaces<'b, 'gcx, 'tcx>>,
     pub uninits: FlowAtLocation<MaybeUninitializedPlaces<'b, 'gcx, 'tcx>>,
     pub move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
@@ -32,7 +33,7 @@ pub(crate) struct Flows<'b, 'gcx: 'tcx, 'tcx: 'b> {
 
 impl<'b, 'gcx, 'tcx> Flows<'b, 'gcx, 'tcx> {
     pub fn new(
-        borrows: FlowAtLocation<ActiveBorrows<'b, 'gcx, 'tcx>>,
+        borrows: FlowAtLocation<Borrows<'b, 'gcx, 'tcx>>,
         inits: FlowAtLocation<MaybeInitializedPlaces<'b, 'gcx, 'tcx>>,
         uninits: FlowAtLocation<MaybeUninitializedPlaces<'b, 'gcx, 'tcx>>,
         move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,

src/librustc_mir/borrow_check/mod.rs

@@ -34,11 +34,10 @@ use syntax_pos::Span;
 use dataflow::{do_dataflow, DebugFormatted};
 use dataflow::FlowAtLocation;
 use dataflow::MoveDataParamEnv;
-use dataflow::{DataflowAnalysis, DataflowResultsConsumer};
+use dataflow::{DataflowResultsConsumer};
 use dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 use dataflow::{EverInitializedPlaces, MovingOutStatements};
 use dataflow::{BorrowData, Borrows, ReserveOrActivateIndex};
-use dataflow::{ActiveBorrows, Reservations};
 use dataflow::indexes::BorrowIndex;
 use dataflow::move_paths::{IllegalMoveOriginKind, MoveError};
 use dataflow::move_paths::{HasMoveData, LookupResult, MoveData, MovePathIndex};
@@ -54,8 +53,6 @@ mod error_reporting;
 mod flows;
 mod prefixes;
 
-use std::borrow::Cow;
-
 pub(crate) mod nll;
 
 pub fn provide(providers: &mut Providers) {
@@ -209,6 +206,18 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
     };
     let flow_inits = flow_inits; // remove mut
 
+    let flow_borrows = FlowAtLocation::new(do_dataflow(
+        tcx,
+        mir,
+        id,
+        &attributes,
+        &dead_unwinds,
+        Borrows::new(tcx, mir, opt_regioncx.clone(), def_id, body_id),
+        |rs, i| {
+            DebugFormatted::new(&(i.kind(), rs.location(i.borrow_index())))
+        }
+    ));
+
     let movable_generator = !match tcx.hir.get(id) {
         hir::map::Node::NodeExpr(&hir::Expr {
             node: hir::ExprClosure(.., Some(hir::GeneratorMovability::Static)),
@@ -230,44 +239,12 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
         },
         access_place_error_reported: FxHashSet(),
         reservation_error_reported: FxHashSet(),
-        nonlexical_regioncx: opt_regioncx.clone(),
+        nonlexical_regioncx: opt_regioncx,
         nonlexical_cause_info: None,
     };
 
-    let borrows = Borrows::new(tcx, mir, opt_regioncx, def_id, body_id);
-    let flow_reservations = do_dataflow(
-        tcx,
-        mir,
-        id,
-        &attributes,
-        &dead_unwinds,
-        Reservations::new(borrows),
-        |rs, i| {
-            // In principle we could make the dataflow ensure that
-            // only reservation bits show up, and assert so here.
-            //
-            // In practice it is easier to be looser; in particular,
-            // it is okay for the kill-sets to hold activation bits.
-            DebugFormatted::new(&(i.kind(), rs.location(i)))
-        },
-    );
-    let flow_active_borrows = {
-        let reservations_on_entry = flow_reservations.0.sets.entry_set_state();
-        let reservations = flow_reservations.0.operator;
-        let a = DataflowAnalysis::new_with_entry_sets(
-            mir,
-            &dead_unwinds,
-            Cow::Borrowed(reservations_on_entry),
-            ActiveBorrows::new(reservations),
-        );
-        let results = a.run(tcx, id, &attributes, |ab, i| {
-            DebugFormatted::new(&(i.kind(), ab.location(i)))
-        });
-        FlowAtLocation::new(results)
-    };
-
     let mut state = Flows::new(
-        flow_active_borrows,
+        flow_borrows,
         flow_inits,
         flow_uninits,
         flow_move_outs,