Rename query_dispatcher and reduce its use.

It's now `query_vtable` because its return type changed. And thanks to
the previous commit it can be manually inlined in several places. (The
only remaining calls to it are in `make_dep_kind_vtable_for_query`,
which are more challenging to remove.)

Author: nnethercote

compiler/rustc_query_impl/src/dep_kind_vtables.rs

@@ -131,10 +131,10 @@ where
         is_eval_always,
         key_fingerprint_style,
         force_from_dep_node: Some(|tcx, dep_node, _| {
-            force_from_dep_node_inner(Q::query_dispatcher(tcx), tcx, dep_node)
+            force_from_dep_node_inner(Q::query_vtable(tcx), tcx, dep_node)
         }),
         try_load_from_on_disk_cache: Some(|tcx, dep_node| {
-            try_load_from_on_disk_cache_inner(Q::query_dispatcher(tcx), tcx, dep_node)
+            try_load_from_on_disk_cache_inner(Q::query_vtable(tcx), tcx, dep_node)
         }),
     }
 }

compiler/rustc_query_impl/src/lib.rs

@@ -50,7 +50,7 @@ mod values;
 trait QueryDispatcherUnerased<'tcx, C: QueryCache> {
     type UnerasedValue;
 
-    fn query_dispatcher(tcx: TyCtxt<'tcx>) -> &'tcx QueryVTable<'tcx, C>;
+    fn query_vtable(tcx: TyCtxt<'tcx>) -> &'tcx QueryVTable<'tcx, C>;
 
     fn restore_val(value: C::Value) -> Self::UnerasedValue;
 }

compiler/rustc_query_impl/src/plumbing.rs

@@ -501,7 +501,7 @@ macro_rules! define_queries {
                     #[cfg(debug_assertions)]
                     let _guard = tracing::span!(tracing::Level::TRACE, stringify!($name), ?key).entered();
                     execution::get_query_incr(
-                        QueryType::query_dispatcher(tcx),
+                        &tcx.query_system.query_vtables.$name,
                         tcx,
                         span,
                         key,
@@ -521,7 +521,7 @@ macro_rules! define_queries {
                     __mode: QueryMode,
                 ) -> Option<Erased<queries::$name::Value<'tcx>>> {
                     Some(execution::get_query_non_incr(
-                        QueryType::query_dispatcher(tcx),
+                        &tcx.query_system.query_vtables.$name,
                         tcx,
                         span,
                         key,
@@ -628,7 +628,7 @@ macro_rules! define_queries {
                 type UnerasedValue = queries::$name::Value<'tcx>;
 
                 #[inline(always)]
-                fn query_dispatcher(tcx: TyCtxt<'tcx>)
+                fn query_vtable(tcx: TyCtxt<'tcx>)
                     -> &'tcx QueryVTable<'tcx, queries::$name::Storage<'tcx>>
                 {
                     &tcx.query_system.query_vtables.$name
@@ -697,7 +697,7 @@ macro_rules! define_queries {
                         query_impl::$name::QueryType<'tcx>,
                         _
                     > (
-                        query_impl::$name::QueryType::query_dispatcher(tcx),
+                        &tcx.query_system.query_vtables.$name,
                         tcx,
                         encoder,
                         query_result_index,
@@ -707,7 +707,7 @@ macro_rules! define_queries {
 
             pub(crate) fn query_key_hash_verify<'tcx>(tcx: TyCtxt<'tcx>) {
                 $crate::plumbing::query_key_hash_verify(
-                    query_impl::$name::QueryType::query_dispatcher(tcx),
+                    &tcx.query_system.query_vtables.$name,
                     tcx,
                 )
             }