Enable otherwise handling in more places

Author: ashivaram23

compiler/rustc_borrowck/src/lib.rs

@@ -511,11 +511,9 @@ fn get_flow_results<'a, 'tcx>(
         body,
         Some("borrowck"),
     );
-    let uninits = MaybeUninitializedPlaces::new(tcx, body, move_data).iterate_to_fixpoint(
-        tcx,
-        body,
-        Some("borrowck"),
-    );
+    let uninits = MaybeUninitializedPlaces::new(tcx, body, move_data)
+        .include_inactive_in_otherwise()
+        .iterate_to_fixpoint(tcx, body, Some("borrowck"));
     let ever_inits = EverInitializedPlaces::new(body, move_data).iterate_to_fixpoint(
         tcx,
         body,

compiler/rustc_borrowck/src/type_check/liveness/trace.rs

@@ -485,6 +485,7 @@ impl<'a, 'typeck, 'tcx> LivenessContext<'a, 'typeck, 'tcx> {
             // case), there are a few dozens compared to e.g. thousands or tens of thousands of
             // locals and move paths.
             let flow_inits = MaybeInitializedPlaces::new(tcx, body, self.move_data)
+                .exclude_inactive_in_otherwise()
                 .iterate_to_fixpoint(tcx, body, Some("borrowck"))
                 .into_results_cursor(body);
             flow_inits