Fix outdated handling of GetLangItems

rust-lang · Aug 5, 2018 · e5d5e6a · e5d5e6a
1 parent 319b052
commit e5d5e6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs
@@ -617,7 +617,7 @@ define_dep_nodes!( <'tcx>
     [] ExternModStmtCnum(DefId),
     [input] GetLibFeatures,
     [] DefinedLibFeatures(CrateNum),
-    [input] GetLangItems,
+    [eval_always] GetLangItems,
     [] DefinedLangItems(CrateNum),
     [] MissingLangItems(CrateNum),
     [] VisibleParentMap,

diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -2851,15 +2851,7 @@ pub fn provide(providers: &mut ty::query::Providers) {
     };
     providers.get_lang_items = |tcx, id| {
         assert_eq!(id, LOCAL_CRATE);
-        // FIXME(#42293) Right now we insert a `with_ignore` node in the dep
-        // graph here to ignore the fact that `get_lang_items` below depends on
-        // the entire crate.  For now this'll prevent false positives of
-        // recompiling too much when anything changes.
-        //
-        // Once red/green incremental compilation lands we should be able to
-        // remove this because while the crate changes often the lint level map
-        // will change rarely.
-        tcx.dep_graph.with_ignore(|| Lrc::new(middle::lang_items::collect(tcx)))
+        Lrc::new(middle::lang_items::collect(tcx))
     };
     providers.freevars = |tcx, id| tcx.gcx.freevars.get(&id).cloned();
     providers.maybe_unused_trait_import = |tcx, id| {