Skip to content

Commit e5d5e6a

Browse files
committed
Fix outdated handling of GetLangItems
1 parent 319b052 commit e5d5e6a

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/librustc/dep_graph/dep_node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ define_dep_nodes!( <'tcx>
617617
[] ExternModStmtCnum(DefId),
618618
[input] GetLibFeatures,
619619
[] DefinedLibFeatures(CrateNum),
620-
[input] GetLangItems,
620+
[eval_always] GetLangItems,
621621
[] DefinedLangItems(CrateNum),
622622
[] MissingLangItems(CrateNum),
623623
[] VisibleParentMap,

src/librustc/ty/context.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2851,15 +2851,7 @@ pub fn provide(providers: &mut ty::query::Providers) {
28512851
};
28522852
providers.get_lang_items = |tcx, id| {
28532853
assert_eq!(id, LOCAL_CRATE);
2854-
// FIXME(#42293) Right now we insert a `with_ignore` node in the dep
2855-
// graph here to ignore the fact that `get_lang_items` below depends on
2856-
// the entire crate. For now this'll prevent false positives of
2857-
// recompiling too much when anything changes.
2858-
//
2859-
// Once red/green incremental compilation lands we should be able to
2860-
// remove this because while the crate changes often the lint level map
2861-
// will change rarely.
2862-
tcx.dep_graph.with_ignore(|| Lrc::new(middle::lang_items::collect(tcx)))
2854+
Lrc::new(middle::lang_items::collect(tcx))
28632855
};
28642856
providers.freevars = |tcx, id| tcx.gcx.freevars.get(&id).cloned();
28652857
providers.maybe_unused_trait_import = |tcx, id| {

0 commit comments

Comments
 (0)