Skip executing MIR effect checking, but instead check that it is already executed elsewhere

Author: Zoxc

src/librustc/ty/query/plumbing.rs

@@ -606,6 +606,23 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
         }
     }
 
+    /// Check that a query has already executed
+    pub(super) fn assert_done<Q: QueryDescription<'gcx>>(self, key: Q::Key) -> () {
+        let dep_node = Q::to_dep_node(self, &key);
+
+        if self.dep_graph.try_mark_green(self, &dep_node).is_some() {
+            // It is already green
+            return;
+        }
+
+        match JobOwner::<'_, 'gcx, Q>::try_get(self, DUMMY_SP, &key) {
+            TryGetJob::NotYetStarted(_) => {
+                bug!("query should already be done {}, key={:?}", Q::NAME, key);
+            },
+            TryGetJob::JobCompleted(..) => {}
+        }
+    }
+
     #[allow(dead_code)]
     fn force_query<Q: QueryDescription<'gcx>>(
         self,
@@ -969,6 +986,12 @@ macro_rules! define_queries_inner {
             fn handle_cycle_error(tcx: TyCtxt<'_, 'tcx, '_>) -> Self::Value {
                 handle_cycle_error!([$($modifiers)*][tcx])
             }
+        }
+
+        impl<'a, $tcx, 'lcx> queries::$name<$tcx> {
+            pub fn assert_done(tcx: TyCtxt<'a, $tcx, 'lcx>, key: $K) -> () {
+                tcx.assert_done::<queries::$name<'_>>(key);
+            }
         })*
 
         #[derive(Copy, Clone)]

src/librustc_driver/driver.rs

@@ -5,6 +5,7 @@ use rustc::hir::map as hir_map;
 use rustc::lint;
 use rustc::middle::{self, reachable, resolve_lifetime, stability};
 use rustc::ty::{self, AllArenas, Resolutions, TyCtxt};
+use rustc::ty::query::queries;
 use rustc::traits;
 use rustc::util::common::{install_panic_hook, time, ErrorReported};
 use rustc::util::profiling::ProfileCategory;
@@ -1284,11 +1285,13 @@ where
                 rustc_traits::lowering::dump_program_clauses(tcx);
             });
 
-            time(sess, "MIR effect checking", || {
+            if cfg!(debug_assertions) {
+                // `unsafety_check_result` should be executed by mir_borrowck.
+                // Ensure that is the case
                 tcx.par_body_owners(|def_id| {
-                    tcx.ensure().unsafety_check_result(def_id);
-                })
-            });
+                    queries::unsafety_check_result::assert_done(tcx, def_id);
+                });
+            }
 
             time(sess, "layout testing", || layout_test::test_layout(tcx));