Auto merge of #146880 - azhogin:azhogin/source_span_hook, r=<try>

source_span hook in case of non-incremental build

Author: rust-bors[bot]

compiler/rustc_interface/src/passes.rs

@@ -963,6 +963,13 @@ pub fn create_and_enter_global_ctxt<T, F: for<'tcx> FnOnce(TyCtxt<'tcx>) -> T>(
 
     let incremental = dep_graph.is_fully_enabled();
 
+    // Optimization of source_span call for non-incremental build
+    if incremental {
+        providers.hooks.source_span = |tcx, def_id| tcx.source_span_q(def_id);
+    } else {
+        providers.hooks.source_span = providers.queries.source_span_q;
+    }
+
     let gcx_cell = OnceLock::new();
     let arena = WorkerLocal::new(|_| Arena::default());
     let hir_arena = WorkerLocal::new(|_| rustc_hir::Arena::default());

compiler/rustc_middle/src/hooks/mod.rs

@@ -6,7 +6,7 @@
 use rustc_hir::def_id::{DefId, DefPathHash};
 use rustc_session::StableCrateId;
 use rustc_span::def_id::{CrateNum, LocalDefId};
-use rustc_span::{ExpnHash, ExpnId};
+use rustc_span::{ExpnHash, ExpnId, Span};
 
 use crate::mir;
 use crate::ty::{Ty, TyCtxt};
@@ -102,6 +102,15 @@ 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;
+
+    /// Return the span for a definition.
+    ///
+    /// Contrary to `def_span` below, this query returns the full absolute span of the definition.
+    /// This span is meant for dep-tracking rather than diagnostics. It should not be used outside
+    /// of rustc_middle::hir::source_map.
+    ///
+    /// Hook is initialized into simple function call (for optimization), if not incremental build
+    hook source_span(key: LocalDefId) -> Span;
 }
 
 #[cold]

compiler/rustc_middle/src/query/mod.rs

@@ -209,7 +209,7 @@ rustc_queries! {
     /// Contrary to `def_span` below, this query returns the full absolute span of the definition.
     /// This span is meant for dep-tracking rather than diagnostics. It should not be used outside
     /// of rustc_middle::hir::source_map.
-    query source_span(key: LocalDefId) -> Span {
+    query source_span_q(key: LocalDefId) -> Span {
         // Accesses untracked data
         eval_always
         desc { "getting the source span" }

compiler/rustc_middle/src/ty/context.rs

@@ -3544,7 +3544,8 @@ pub fn provide(providers: &mut Providers) {
         // We want to check if the panic handler was defined in this crate
         tcx.lang_items().panic_impl().is_some_and(|did| did.is_local())
     };
-    providers.source_span = |tcx, def_id| tcx.untracked.source_span.get(def_id).unwrap_or(DUMMY_SP);
+    providers.source_span_q =
+        |tcx, def_id| tcx.untracked.source_span.get(def_id).unwrap_or(DUMMY_SP);
 }
 
 pub fn contains_name(attrs: &[Attribute], name: Symbol) -> bool {