Auto merge of #53403 - spastorino:move-out-lazily, r=<try>

[WIP] Do not used Move data flow analysis to see perf wins

This commit has the only purposed to be tested by:

@bors try

If this makes sense I'm gonna do the real work :).
When all that happens, this should:

Close #53394

Author: bors

src/librustc_mir/borrow_check/error_reporting.rs

@@ -29,6 +29,7 @@ use dataflow::{FlowAtLocation, MovingOutStatements};
 use util::borrowck_errors::{BorrowckErrors, Origin};
 
 impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
+    #[allow(unused)]
     pub(super) fn report_use_of_moved_or_uninitialized(
         &mut self,
         context: Context,
@@ -869,6 +870,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
     }
 
     // Retrieve type of a place for the current MIR representation
+    #[allow(unused)]
     fn retrieve_type_for_place(&self, place: &Place<'tcx>) -> Option<ty::Ty> {
         match place {
             Place::Local(local) => {

src/librustc_mir/borrow_check/flows.rs

@@ -24,7 +24,7 @@ use polonius_engine::Output;
 use dataflow::move_paths::indexes::BorrowIndex;
 use dataflow::move_paths::HasMoveData;
 use dataflow::Borrows;
-use dataflow::{EverInitializedPlaces, MovingOutStatements};
+use dataflow::{EverInitializedPlaces}; //, MovingOutStatements};
 use dataflow::{FlowAtLocation, FlowsAtLocation};
 use dataflow::MaybeUninitializedPlaces;
 use either::Either;
@@ -35,7 +35,7 @@ use std::rc::Rc;
 crate struct Flows<'b, 'gcx: 'tcx, 'tcx: 'b> {
     borrows: FlowAtLocation<Borrows<'b, 'gcx, 'tcx>>,
     pub uninits: FlowAtLocation<MaybeUninitializedPlaces<'b, 'gcx, 'tcx>>,
-    pub move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
+    //pub move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
     pub ever_inits: FlowAtLocation<EverInitializedPlaces<'b, 'gcx, 'tcx>>,
 
     /// Polonius Output
@@ -46,14 +46,14 @@ impl<'b, 'gcx, 'tcx> Flows<'b, 'gcx, 'tcx> {
     crate fn new(
         borrows: FlowAtLocation<Borrows<'b, 'gcx, 'tcx>>,
         uninits: FlowAtLocation<MaybeUninitializedPlaces<'b, 'gcx, 'tcx>>,
-        move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
+        //move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
         ever_inits: FlowAtLocation<EverInitializedPlaces<'b, 'gcx, 'tcx>>,
         polonius_output: Option<Rc<Output<RegionVid, BorrowIndex, LocationIndex>>>,
     ) -> Self {
         Flows {
             borrows,
             uninits,
-            move_outs,
+            //move_outs,
             ever_inits,
             polonius_output,
         }
@@ -79,7 +79,7 @@ macro_rules! each_flow {
     ($this:ident, $meth:ident($arg:ident)) => {
         FlowAtLocation::$meth(&mut $this.borrows, $arg);
         FlowAtLocation::$meth(&mut $this.uninits, $arg);
-        FlowAtLocation::$meth(&mut $this.move_outs, $arg);
+        //FlowAtLocation::$meth(&mut $this.move_outs, $arg);
         FlowAtLocation::$meth(&mut $this.ever_inits, $arg);
     };
 }
@@ -142,6 +142,7 @@ impl<'b, 'gcx, 'tcx> fmt::Display for Flows<'b, 'gcx, 'tcx> {
         });
         s.push_str("] ");
 
+        /*
         s.push_str("move_out: [");
         let mut saw_one = false;
         self.move_outs.each_state_bit(|mpi_move_out| {
@@ -153,6 +154,7 @@ impl<'b, 'gcx, 'tcx> fmt::Display for Flows<'b, 'gcx, 'tcx> {
             s.push_str(&format!("{:?}", move_out));
         });
         s.push_str("] ");
+        */
 
         s.push_str("ever_init: [");
         let mut saw_one = false;

src/librustc_mir/borrow_check/mod.rs

@@ -42,7 +42,7 @@ use dataflow::DataflowResultsConsumer;
 use dataflow::FlowAtLocation;
 use dataflow::MoveDataParamEnv;
 use dataflow::{do_dataflow, DebugFormatted};
-use dataflow::{EverInitializedPlaces, MovingOutStatements};
+use dataflow::{EverInitializedPlaces}; //, MovingOutStatements};
 use dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 use util::borrowck_errors::{BorrowckErrors, Origin};
 
@@ -185,15 +185,15 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
         MaybeUninitializedPlaces::new(tcx, mir, &mdpe),
         |bd, i| DebugFormatted::new(&bd.move_data().move_paths[i]),
     ));
-    let flow_move_outs = FlowAtLocation::new(do_dataflow(
+    /*let flow_move_outs = FlowAtLocation::new(do_dataflow(
         tcx,
         mir,
         id,
         &attributes,
         &dead_unwinds,
         MovingOutStatements::new(tcx, mir, &mdpe),
         |bd, i| DebugFormatted::new(&bd.move_data().moves[i]),
-    ));
+    ));*/
     let flow_ever_inits = FlowAtLocation::new(do_dataflow(
         tcx,
         mir,
@@ -267,7 +267,7 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
     let mut state = Flows::new(
         flow_borrows,
         flow_uninits,
-        flow_move_outs,
+        //flow_move_outs,
         flow_ever_inits,
         polonius_output,
     );
@@ -407,6 +407,7 @@ pub struct MirBorrowckCtxt<'cx, 'gcx: 'tcx, 'tcx: 'cx> {
     reservation_error_reported: FxHashSet<Place<'tcx>>,
     /// This field keeps track of errors reported in the checking of moved variables,
     /// so that we don't report seemingly duplicate errors.
+    #[allow(unused)]
     moved_error_reported: FxHashSet<Place<'tcx>>,
     /// Errors to be reported buffer
     errors_buffer: Vec<Diagnostic>,
@@ -805,6 +806,7 @@ struct AccessErrorsReported {
 }
 
 #[derive(Copy, Clone)]
+#[allow(unused)]
 enum InitializationRequiringAction {
     Update,
     Borrow,
@@ -818,6 +820,7 @@ struct RootPlace<'d, 'tcx: 'd> {
 }
 
 impl InitializationRequiringAction {
+    #[allow(unused)]
     fn as_noun(self) -> &'static str {
         match self {
             InitializationRequiringAction::Update => "update",
@@ -827,6 +830,7 @@ impl InitializationRequiringAction {
         }
     }
 
+    #[allow(unused)]
     fn as_verb_in_past_tense(self) -> &'static str {
         match self {
             InitializationRequiringAction::Update => "updated",
@@ -1616,8 +1620,8 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
 
     fn check_if_full_path_is_moved(
         &mut self,
-        context: Context,
-        desired_action: InitializationRequiringAction,
+        _context: Context,
+        _desired_action: InitializationRequiringAction,
         place_span: (&Place<'tcx>, Span),
         flow_state: &Flows<'cx, 'gcx, 'tcx>,
     ) {
@@ -1626,7 +1630,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
         let place = self.base_path(place_span.0);
 
         let maybe_uninits = &flow_state.uninits;
-        let curr_move_outs = &flow_state.move_outs;
+        //let curr_move_outs = &flow_state.move_outs;
 
         // Bad scenarios:
         //
@@ -1667,13 +1671,13 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
         match self.move_path_closest_to(place) {
             Ok(mpi) => {
                 if maybe_uninits.contains(&mpi) {
-                    self.report_use_of_moved_or_uninitialized(
+                    /*self.report_use_of_moved_or_uninitialized(
                         context,
                         desired_action,
                         place_span,
                         mpi,
                         curr_move_outs,
-                    );
+                    );*/
                     return; // don't bother finding other problems.
                 }
             }
@@ -1700,7 +1704,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
         let place = self.base_path(place_span.0);
 
         let maybe_uninits = &flow_state.uninits;
-        let curr_move_outs = &flow_state.move_outs;
+        //let curr_move_outs = &flow_state.move_outs;
 
         // Bad scenarios:
         //
@@ -1730,14 +1734,16 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
 
         debug!("check_if_path_or_subpath_is_moved place: {:?}", place);
         if let Some(mpi) = self.move_path_for_place(place) {
-            if let Some(child_mpi) = maybe_uninits.has_any_child_of(mpi) {
+            if let Some(_child_mpi) = maybe_uninits.has_any_child_of(mpi) {
+                /*
                 self.report_use_of_moved_or_uninitialized(
                     context,
                     desired_action,
                     place_span,
                     child_mpi,
                     curr_move_outs,
                 );
+                */
                 return; // don't bother finding other problems.
             }
         }