From 137439249ba1d32e73e831a8c26a5499c4b4051b Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Sun, 6 Jun 2021 13:50:20 +0200 Subject: [PATCH 1/4] Remove eval_always from crate_name. The crate name is part of the StableCrateId. --- compiler/rustc_middle/src/query/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs index ca93efbf19b7b..2d1ddddfa1644 100644 --- a/compiler/rustc_middle/src/query/mod.rs +++ b/compiler/rustc_middle/src/query/mod.rs @@ -1473,7 +1473,6 @@ rustc_queries! { /// Gets the name of the crate. query crate_name(_: CrateNum) -> Symbol { - eval_always desc { "fetching what a crate is named" } separate_provide_extern } From d2eea829e13db71f4ac4a21bcc7a0ad41df800f4 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Sun, 6 Jun 2021 13:51:28 +0200 Subject: [PATCH 2/4] Remove eval_always for privacy. --- compiler/rustc_middle/src/query/mod.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs index 2d1ddddfa1644..ffe58f84f9027 100644 --- a/compiler/rustc_middle/src/query/mod.rs +++ b/compiler/rustc_middle/src/query/mod.rs @@ -915,11 +915,9 @@ rustc_queries! { /// Performs part of the privacy check and computes "access levels". query privacy_access_levels(_: ()) -> &'tcx AccessLevels { - eval_always desc { "privacy access levels" } } query check_private_in_public(_: ()) -> () { - eval_always desc { "checking for private elements in public interfaces" } } From 9125b174e85619c475a612df003d2106c949be88 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Sun, 6 Jun 2021 13:52:26 +0200 Subject: [PATCH 3/4] Remove eval_always for lang items. --- compiler/rustc_middle/src/query/mod.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs index ffe58f84f9027..811342877a127 100644 --- a/compiler/rustc_middle/src/query/mod.rs +++ b/compiler/rustc_middle/src/query/mod.rs @@ -1484,25 +1484,21 @@ rustc_queries! { query get_lib_features(_: ()) -> LibFeatures { storage(ArenaCacheSelector<'tcx>) - eval_always desc { "calculating the lib features map" } } - query defined_lib_features(_: CrateNum) - -> &'tcx [(Symbol, Option)] { + query defined_lib_features(_: CrateNum) -> &'tcx [(Symbol, Option)] { desc { "calculating the lib features defined in a crate" } separate_provide_extern } /// Returns the lang items defined in another crate by loading it from metadata. query get_lang_items(_: ()) -> LanguageItems { storage(ArenaCacheSelector<'tcx>) - eval_always desc { "calculating the lang items map" } } /// Returns all diagnostic items defined in all crates. query all_diagnostic_items(_: ()) -> rustc_hir::diagnostic_items::DiagnosticItems { storage(ArenaCacheSelector<'tcx>) - eval_always desc { "calculating the diagnostic items map" } } From 433f711bc8894c4b826f6ffed13b2e353dbcd266 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Sun, 6 Jun 2021 13:54:47 +0200 Subject: [PATCH 4/4] Remove eval_always from partitioning. --- compiler/rustc_middle/src/query/mod.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs index 811342877a127..347b06b04722b 100644 --- a/compiler/rustc_middle/src/query/mod.rs +++ b/compiler/rustc_middle/src/query/mod.rs @@ -1595,7 +1595,6 @@ rustc_queries! { } query collect_and_partition_mono_items(_: ()) -> (&'tcx DefIdSet, &'tcx [CodegenUnit<'tcx>]) { - eval_always desc { "collect_and_partition_mono_items" } } query is_codegened_item(def_id: DefId) -> bool { @@ -1604,7 +1603,6 @@ rustc_queries! { /// All items participating in code generation together with items inlined into them. query codegened_and_inlined_items(_: ()) -> &'tcx DefIdSet { - eval_always desc { "codegened_and_inlined_items" } }