Querify should_codegen_locally

Author: saethlin

compiler/rustc_middle/src/hooks/mod.rs

@@ -104,10 +104,6 @@ declare_hooks! {
 
     /// Create a list-like THIR representation for debugging.
     hook thir_flat(key: LocalDefId) -> String;
-
-    /// Returns `true` if we should codegen an instance in the local crate, or returns `false` if we
-    /// can just link to the upstream crate and therefore don't need a mono item.
-    hook should_codegen_locally(instance: crate::ty::Instance<'tcx>) -> bool;
 }
 
 #[cold]

compiler/rustc_middle/src/query/mod.rs

@@ -1634,6 +1634,11 @@ rustc_queries! {
         separate_provide_extern
     }
 
+    query should_codegen_locally(key: ty::Instance<'tcx>) -> bool {
+        desc { "checking whether `{}` should be linked to or lowered", key }
+        cache_on_disk_if { true }
+    }
+
     /// Returns the upstream crate that exports drop-glue for the given
     /// type (`args` is expected to be a single-item list containing the
     /// type one wants drop-glue for).

compiler/rustc_monomorphize/src/collector.rs

@@ -921,7 +921,7 @@ fn visit_instance_use<'tcx>(
 
 /// Returns `true` if we should codegen an instance in the local crate, or returns `false` if we
 /// can just link to the upstream crate and therefore don't need a mono item.
-fn should_codegen_locally<'tcx>(tcx: TyCtxtAt<'tcx>, instance: Instance<'tcx>) -> bool {
+fn should_codegen_locally<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx>) -> bool {
     let Some(def_id) = instance.def.def_id_if_not_guaranteed_local_codegen() else {
         return true;
     };
@@ -937,7 +937,7 @@ fn should_codegen_locally<'tcx>(tcx: TyCtxtAt<'tcx>, instance: Instance<'tcx>) -
     }
 
     if tcx.is_reachable_non_generic(def_id)
-        || instance.polymorphize(*tcx).upstream_monomorphization(*tcx).is_some()
+        || instance.polymorphize(tcx).upstream_monomorphization(tcx).is_some()
     {
         // We can link to the item in question, no instance needed in this crate.
         return false;
@@ -1595,5 +1595,5 @@ pub(crate) fn collect_crate_mono_items<'tcx>(
 }
 
 pub(crate) fn provide(providers: &mut Providers) {
-    providers.hooks.should_codegen_locally = should_codegen_locally;
+    providers.should_codegen_locally = should_codegen_locally;
 }