Generate callfront calls mainly in macros

Author: aerooneqq

compiler/rustc_query_impl/src/callback.rs …mpiler/rustc_query_impl/src/callfront.rscompiler/rustc_query_impl/src/callback.rs renamed to compiler/rustc_query_impl/src/callfront.rs compiler/rustc_query_impl/src/callback.rs renamed to compiler/rustc_query_impl/src/callfront.rs

@@ -276,15 +276,6 @@ fn wait_for_query<'tcx, C: QueryCache>(
     }
 }
 
-fn execute_query_and_callback<'tcx, R, C: QueryCache>(
-    tcx: TyCtxt<'tcx>,
-    query: &'tcx QueryVTable<'tcx, C>,
-    action: impl FnOnce() -> R,
-) -> R {
-    query.callfront_fn.filter(|_| !tcx.is_in_sandbox()).inspect(|f| (f)(tcx));
-    action()
-}
-
 /// Shared main part of both [`execute_query_incr_inner`] and [`execute_query_non_incr_inner`].
 #[inline(never)]
 fn try_execute_query<'tcx, C: QueryCache, const INCR: bool>(
@@ -633,9 +624,7 @@ pub(super) fn execute_query_non_incr_inner<'tcx, C: QueryCache>(
     span: Span,
     key: C::Key,
 ) -> C::Value {
-    execute_query_and_callback(tcx, query, || {
-        ensure_sufficient_stack(|| try_execute_query::<C, false>(query, tcx, span, key, None).0)
-    })
+    ensure_sufficient_stack(|| try_execute_query::<C, false>(query, tcx, span, key, None).0)
 }
 
 /// Called by a macro-generated impl of [`QueryVTable::execute_query_fn`],
@@ -657,16 +646,14 @@ pub(super) fn execute_query_incr_inner<'tcx, C: QueryCache>(
         return None;
     }
 
-    execute_query_and_callback(tcx, query, || {
-        let (result, dep_node_index) = ensure_sufficient_stack(|| {
-            try_execute_query::<C, true>(query, tcx, span, key, Some(dep_node))
-        });
-        if let Some(dep_node_index) = dep_node_index {
-            tcx.dep_graph.read_index(dep_node_index)
-        }
+    let (result, dep_node_index) = ensure_sufficient_stack(|| {
+        try_execute_query::<C, true>(query, tcx, span, key, Some(dep_node))
+    });
+    if let Some(dep_node_index) = dep_node_index {
+        tcx.dep_graph.read_index(dep_node_index)
+    }
 
-        Some(result)
-    })
+    Some(result)
 }
 
 /// Inner implementation of [`DepKindVTable::force_from_dep_node_fn`][force_fn]
@@ -684,10 +671,9 @@ pub(crate) fn force_query_dep_node<'tcx, C: QueryCache>(
         return false;
     };
 
-    execute_query_and_callback(tcx, query, || {
-        ensure_sufficient_stack(|| {
-            try_execute_query::<C, true>(query, tcx, DUMMY_SP, key, Some(dep_node))
-        });
+    query.callfront_fn.filter(|_| !tcx.is_in_sandbox()).inspect(|f| (f)(tcx));
+    ensure_sufficient_stack(|| {
+        try_execute_query::<C, true>(query, tcx, DUMMY_SP, key, Some(dep_node))
     });
 
     // We did manage to recover a key and force the node, though it's up to

compiler/rustc_query_impl/src/execution.rs

@@ -19,7 +19,7 @@ pub use crate::dep_kind_vtables::make_dep_kind_vtables;
 pub use crate::execution::{CollectActiveJobsKind, collect_active_query_jobs};
 pub use crate::job::{QueryJobMap, break_query_cycle, print_query_stack};
 use crate::query_impl::for_each_query_vtable;
-mod callback;
+mod callfront;
 mod dep_kind_vtables;
 mod error;
 mod execution;

compiler/rustc_query_impl/src/lib.rs

@@ -57,6 +57,12 @@ macro_rules! define_queries {
                         key: Key<'tcx>,
                         mode: QueryMode,
                     ) -> Option<Erased<Value<'tcx>>> {
+                        #[cfg($callfront)]
+                        {
+                            let vtable = &tcx.query_system.query_vtables.$name;
+                            vtable.callfront_fn.filter(|_| !tcx.is_in_sandbox()).inspect(|f| (f)(tcx));
+                        }
+
                         #[cfg(debug_assertions)]
                         let _guard = tracing::span!(tracing::Level::TRACE, stringify!($name), ?key).entered();
                         crate::execution::execute_query_incr_inner(
@@ -80,6 +86,12 @@ macro_rules! define_queries {
                         key: Key<'tcx>,
                         __mode: QueryMode,
                     ) -> Option<Erased<Value<'tcx>>> {
+                        #[cfg($callfront)]
+                        {
+                            let vtable = &tcx.query_system.query_vtables.$name;
+                            vtable.callfront_fn.filter(|_| !tcx.is_in_sandbox()).inspect(|f| (f)(tcx));
+                        }
+
                         Some(crate::execution::execute_query_non_incr_inner(
                             &tcx.query_system.query_vtables.$name,
                             tcx,
@@ -204,7 +216,7 @@ macro_rules! define_queries {
 
                         #[cfg($callfront)]
                         callfront_fn: Some(|tcx| {
-                            $crate::callback::$name(tcx);
+                            $crate::callfront::$name(tcx);
                         }),
 
                         #[cfg(not($callfront))]