Do not depend on FOREVER_RED_NODE.

Author: cjgillot

compiler/rustc_middle/src/ty/context.rs

@@ -947,9 +947,8 @@ impl<'tcx> TyCtxtAt<'tcx> {
 
 impl<'tcx> TyCtxt<'tcx> {
     pub fn iter_local_def_id(self) -> impl Iterator<Item = LocalDefId> + 'tcx {
-        // Create a dependency to the red node to be sure we re-execute this when the amount of
-        // definitions change.
-        self.dep_graph.read_index(DepNodeIndex::FOREVER_RED_NODE);
+        // Depend on the `analysis` query to ensure compilation if finished.
+        self.ensure().analysis(());
 
         let definitions = &self.untracked.definitions;
         std::iter::from_generator(|| {
@@ -969,9 +968,8 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     pub fn def_path_table(self) -> &'tcx rustc_hir::definitions::DefPathTable {
-        // Create a dependency to the crate to be sure we re-execute this when the amount of
-        // definitions change.
-        self.dep_graph.read_index(DepNodeIndex::FOREVER_RED_NODE);
+        // Depend on the `analysis` query to ensure compilation if finished.
+        self.ensure().analysis(());
 
         // Leak a read lock once we start iterating on definitions, to prevent adding new ones
         // while iterating. If some query needs to add definitions, it should be `ensure`d above.