Remove the tcx parameter from will_cache_on_disk_for_key_fn

Author: Zalathar

compiler/rustc_middle/src/query/plumbing.rs

@@ -97,7 +97,7 @@ pub struct QueryVTable<'tcx, C: QueryCache> {
     /// This should be the only code that calls the provider function.
     pub invoke_provider_fn: fn(tcx: TyCtxt<'tcx>, key: C::Key) -> C::Value,
 
-    pub will_cache_on_disk_for_key_fn: fn(tcx: TyCtxt<'tcx>, key: C::Key) -> bool,
+    pub will_cache_on_disk_for_key_fn: fn(key: C::Key) -> bool,
 
     pub try_load_from_disk_fn: fn(
         tcx: TyCtxt<'tcx>,

compiler/rustc_query_impl/src/execution.rs

@@ -576,7 +576,7 @@ fn ensure_can_skip_execution<'tcx, C: QueryCache>(
                 // needed, which guarantees the query provider will never run
                 // for this key.
                 EnsureMode::Done => {
-                    (query.will_cache_on_disk_for_key_fn)(tcx, key)
+                    (query.will_cache_on_disk_for_key_fn)(key)
                         && loadable_from_disk(tcx, serialized_dep_node_index)
                 }
             }

compiler/rustc_query_impl/src/plumbing.rs

@@ -93,7 +93,7 @@ fn encode_query_values_inner<'a, 'tcx, C, V>(
 
     assert!(all_inactive(&query.state));
     query.cache.for_each(&mut |key, value, dep_node| {
-        if (query.will_cache_on_disk_for_key_fn)(tcx, *key) {
+        if (query.will_cache_on_disk_for_key_fn)(*key) {
             encoder.encode_query_value::<V>(dep_node, &erase::restore_val::<V>(*value));
         }
     });
@@ -152,7 +152,7 @@ pub(crate) fn promote_from_disk_inner<'tcx, C: QueryCache>(
 
     // If the recovered key isn't eligible for cache-on-disk, then there's no
     // value on disk to promote.
-    if !(query.will_cache_on_disk_for_key_fn)(tcx, key) {
+    if !(query.will_cache_on_disk_for_key_fn)(key) {
         return;
     }
 

compiler/rustc_query_impl/src/query_impl.rs

@@ -126,7 +126,6 @@ macro_rules! define_queries {
                 }
 
                 fn will_cache_on_disk_for_key<'tcx>(
-                    _tcx: TyCtxt<'tcx>,
                     _key: rustc_middle::queries::$name::Key<'tcx>,
                 ) -> bool {
                     if !cfg!($cache_on_disk) {
@@ -167,7 +166,7 @@ macro_rules! define_queries {
                             use rustc_middle::queries::$name::{ProvidedValue, provided_to_erased};
 
                             // Check the cache-on-disk condition for this key.
-                            if !$crate::query_impl::$name::will_cache_on_disk_for_key(tcx, key) {
+                            if !$crate::query_impl::$name::will_cache_on_disk_for_key(key) {
                                 return None;
                             }