From 3bb25d6bfb651570c0dc8254495f30718eb9ac46 Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Mon, 27 Nov 2017 10:50:15 +0100 Subject: [PATCH] incr.comp.: Add some missing DepNode [input] annotations. --- src/librustc/dep_graph/dep_node.rs | 8 ++++---- src/librustc/ty/context.rs | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs index 00c602d033f8..1fc3b04adb86 100644 --- a/src/librustc/dep_graph/dep_node.rs +++ b/src/librustc/dep_graph/dep_node.rs @@ -562,7 +562,7 @@ define_dep_nodes!( <'tcx> [] IsPanicRuntime(CrateNum), [] IsCompilerBuiltins(CrateNum), [] HasGlobalAllocator(CrateNum), - [] ExternCrate(DefId), + [input] ExternCrate(DefId), [eval_always] LintLevels, [] Specializes { impl1: DefId, impl2: DefId }, [input] InScopeTraits(DefIndex), @@ -602,8 +602,8 @@ define_dep_nodes!( <'tcx> [] MissingLangItems(CrateNum), [] ExternConstBody(DefId), [] VisibleParentMap, - [] MissingExternCrateItem(CrateNum), - [] UsedCrateSource(CrateNum), + [input] MissingExternCrateItem(CrateNum), + [input] UsedCrateSource(CrateNum), [input] PostorderCnums, [input] HasCloneClosures(CrateNum), [input] HasCopyClosures(CrateNum), @@ -619,7 +619,7 @@ define_dep_nodes!( <'tcx> [input] Freevars(DefId), [input] MaybeUnusedTraitImport(DefId), [input] MaybeUnusedExternCrates, - [] StabilityIndex, + [eval_always] StabilityIndex, [input] AllCrateNums, [] ExportedSymbols(CrateNum), [eval_always] CollectAndPartitionTranslationItems, diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index b0dce1f66849..56754bbc13ed 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -1124,11 +1124,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { } pub fn stability(self) -> Rc> { - // FIXME(#42293) we should actually track this, but fails too many tests - // today. - self.dep_graph.with_ignore(|| { - self.stability_index(LOCAL_CRATE) - }) + self.stability_index(LOCAL_CRATE) } pub fn crates(self) -> Rc> {