Auto merge of #147388 - azhogin:azhogin/alloc-query-opt-etc, r=<try>

allocator_kind and related queries converted to hooks

Author: rust-bors[bot]

compiler/rustc_codegen_cranelift/src/allocator.rs

@@ -19,7 +19,7 @@ pub(crate) fn codegen(tcx: TyCtxt<'_>, module: &mut dyn Module) -> bool {
         tcx,
         module,
         kind,
-        tcx.alloc_error_handler_kind(()).unwrap(),
+        tcx.alloc_error_handler_kind().unwrap(),
         tcx.sess.opts.unstable_opts.oom,
     );
     true

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -1826,7 +1826,7 @@ fn exported_symbols_for_non_proc_macro(
     // Mark allocator shim symbols as exported only if they were generated.
     if export_threshold == SymbolExportLevel::Rust
         && needs_allocator_shim_for_linking(tcx.dependency_formats(()), crate_type)
-        && tcx.allocator_kind(()).is_some()
+        && tcx.allocator_kind().is_some()
     {
         symbols.extend(allocator_shim_symbols(tcx));
     }

compiler/rustc_codegen_ssa/src/base.rs

@@ -639,7 +639,7 @@ pub fn allocator_kind_for_codegen(tcx: TyCtxt<'_>) -> Option<AllocatorKind> {
         use rustc_middle::middle::dependency_format::Linkage;
         list.iter().any(|&linkage| linkage == Linkage::Dynamic)
     });
-    if all_crate_types_any_dynamic_crate { None } else { tcx.allocator_kind(()) }
+    if all_crate_types_any_dynamic_crate { None } else { tcx.allocator_kind() }
 }
 
 /// Decide if this particular crate type needs an allocator shim linked in.
@@ -705,7 +705,7 @@ pub fn codegen_crate<B: ExtraBackendMethods>(
                 kind,
                 // If allocator_kind is Some then alloc_error_handler_kind must
                 // also be Some.
-                tcx.alloc_error_handler_kind(()).unwrap(),
+                tcx.alloc_error_handler_kind().unwrap(),
             );
             Some(ModuleCodegen::new_allocator(llmod_id, module))
         })

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -328,8 +328,6 @@ provide! { tcx, def_id, other, cdata,
     is_private_dep => { cdata.private_dep }
     is_panic_runtime => { cdata.root.panic_runtime }
     is_compiler_builtins => { cdata.root.compiler_builtins }
-    has_global_allocator => { cdata.root.has_global_allocator }
-    has_alloc_error_handler => { cdata.root.has_alloc_error_handler }
     has_panic_handler => { cdata.root.has_panic_handler }
     is_profiler_runtime => { cdata.root.profiler_runtime }
     required_panic_strategy => { cdata.root.required_panic_strategy }
@@ -407,8 +405,6 @@ provide! { tcx, def_id, other, cdata,
 pub(in crate::rmeta) fn provide(providers: &mut Providers) {
     provide_cstore_hooks(providers);
     providers.queries = rustc_middle::query::Providers {
-        allocator_kind: |tcx, ()| CStore::from_tcx(tcx).allocator_kind(),
-        alloc_error_handler_kind: |tcx, ()| CStore::from_tcx(tcx).alloc_error_handler_kind(),
         is_private_dep: |_tcx, LocalCrate| false,
         native_library: |tcx, id| {
             tcx.native_libraries(id.krate)
@@ -519,8 +515,6 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
         },
 
         dependency_formats: |tcx, ()| Arc::new(crate::dependency_format::calculate(tcx)),
-        has_global_allocator: |tcx, LocalCrate| CStore::from_tcx(tcx).has_global_allocator(),
-        has_alloc_error_handler: |tcx, LocalCrate| CStore::from_tcx(tcx).has_alloc_error_handler(),
         postorder_cnums: |tcx, ()| {
             tcx.arena.alloc_from_iter(
                 CStore::from_tcx(tcx).crate_dependencies_in_postorder(LOCAL_CRATE).into_iter(),
@@ -706,4 +700,33 @@ fn provide_cstore_hooks(providers: &mut Providers) {
             cdata.imported_source_file(file_index as u32, tcx.sess);
         }
     };
+    providers.hooks.allocator_kind = |tcx| CStore::from_tcx(tcx).allocator_kind();
+    providers.hooks.alloc_error_handler_kind =
+        |tcx| CStore::from_tcx(tcx).alloc_error_handler_kind();
+    providers.hooks.has_global_allocator = |tcx, krate: CrateNum| {
+        if krate == LOCAL_CRATE {
+            CStore::from_tcx(tcx).has_global_allocator()
+        } else {
+            let cdata =
+                rustc_data_structures::sync::FreezeReadGuard::map(CStore::from_tcx(tcx), |c| {
+                    c.get_crate_data(krate).cdata
+                });
+            let cdata =
+                crate::creader::CrateMetadataRef { cdata: &cdata, cstore: &CStore::from_tcx(tcx) };
+            cdata.root.has_global_allocator
+        }
+    };
+    providers.hooks.has_alloc_error_handler = |tcx, krate: CrateNum| {
+        if krate == LOCAL_CRATE {
+            CStore::from_tcx(tcx).has_alloc_error_handler()
+        } else {
+            let cdata =
+                rustc_data_structures::sync::FreezeReadGuard::map(CStore::from_tcx(tcx), |c| {
+                    c.get_crate_data(krate).cdata
+                });
+            let cdata =
+                crate::creader::CrateMetadataRef { cdata: &cdata, cstore: &CStore::from_tcx(tcx) };
+            cdata.root.has_alloc_error_handler
+        }
+    }
 }

compiler/rustc_middle/src/hooks/mod.rs

@@ -3,6 +3,7 @@
 //! similar to queries, but queries come with a lot of machinery for caching and incremental
 //! compilation, whereas hooks are just plain function pointers without any of the query magic.
 
+use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_hir::def_id::{DefId, DefPathHash};
 use rustc_session::StableCrateId;
 use rustc_span::def_id::{CrateNum, LocalDefId};
@@ -102,6 +103,11 @@ declare_hooks! {
     /// Ensure the given scalar is valid for the given type.
     /// This checks non-recursive runtime validity.
     hook validate_scalar_in_layout(scalar: crate::ty::ScalarInt, ty: Ty<'tcx>) -> bool;
+
+    hook allocator_kind() -> Option<AllocatorKind>;
+    hook alloc_error_handler_kind() -> Option<AllocatorKind>;
+    hook has_global_allocator(krate: CrateNum) -> bool;
+    hook has_alloc_error_handler(krate: CrateNum) -> bool;
 }
 
 #[cold]

compiler/rustc_middle/src/query/mod.rs

@@ -69,7 +69,6 @@ use std::sync::Arc;
 
 use rustc_abi::Align;
 use rustc_arena::TypedArena;
-use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_data_structures::sorted_map::SortedMap;
@@ -1812,20 +1811,6 @@ rustc_queries! {
         desc { "checking if the crate is_compiler_builtins" }
         separate_provide_extern
     }
-    query has_global_allocator(_: CrateNum) -> bool {
-        // This query depends on untracked global state in CStore
-        eval_always
-        fatal_cycle
-        desc { "checking if the crate has_global_allocator" }
-        separate_provide_extern
-    }
-    query has_alloc_error_handler(_: CrateNum) -> bool {
-        // This query depends on untracked global state in CStore
-        eval_always
-        fatal_cycle
-        desc { "checking if the crate has_alloc_error_handler" }
-        separate_provide_extern
-    }
     query has_panic_handler(_: CrateNum) -> bool {
         fatal_cycle
         desc { "checking if the crate has_panic_handler" }
@@ -2301,14 +2286,6 @@ rustc_queries! {
         desc { "checking whether crate `{}` is a private dependency", c }
         separate_provide_extern
     }
-    query allocator_kind(_: ()) -> Option<AllocatorKind> {
-        eval_always
-        desc { "getting the allocator kind for the current crate" }
-    }
-    query alloc_error_handler_kind(_: ()) -> Option<AllocatorKind> {
-        eval_always
-        desc { "alloc error handler kind for the current crate" }
-    }
 
     query upvars_mentioned(def_id: DefId) -> Option<&'tcx FxIndexMap<hir::HirId, hir::Upvar>> {
         desc { |tcx| "collecting upvars mentioned in `{}`", tcx.def_path_str(def_id) }

src/tools/miri/src/shims/alloc.rs

@@ -61,7 +61,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     ) -> InterpResult<'tcx, EmulateItemResult> {
         let this = self.eval_context_mut();
 
-        let Some(allocator_kind) = this.tcx.allocator_kind(()) else {
+        let Some(allocator_kind) = this.tcx.allocator_kind() else {
             // in real code, this symbol does not exist without an allocator
             return interp_ok(EmulateItemResult::NotSupported);
         };

src/tools/miri/src/shims/foreign_items.rs

@@ -53,7 +53,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         match link_name.as_str() {
             name if name == this.mangle_internal_symbol("__rust_alloc_error_handler") => {
                 // Forward to the right symbol that implements this function.
-                let Some(handler_kind) = this.tcx.alloc_error_handler_kind(()) else {
+                let Some(handler_kind) = this.tcx.alloc_error_handler_kind() else {
                     // in real code, this symbol does not exist without an allocator
                     throw_unsup_format!(
                         "`__rust_alloc_error_handler` cannot be called when no alloc error handler is set"