Remove ALLOC_SELF_PROFILE_QUERY_STRINGS.

And also `alloc_self_profile_query_strings` for each query. This is done
by generating the top-level `alloc_self_profile_query_strings` and
having it do things more directly.

Author: nnethercote

compiler/rustc_query_impl/src/lib.rs

@@ -21,7 +21,6 @@ pub use crate::dep_kind_vtables::make_dep_kind_vtables;
 pub use crate::job::{QueryJobMap, break_query_cycles, print_query_stack};
 use crate::plumbing::{encode_all_query_results, try_mark_green};
 use crate::profiling_support::QueryKeyStringCache;
-pub use crate::profiling_support::alloc_self_profile_query_strings;
 use crate::values::Value;
 
 #[macro_use]

compiler/rustc_query_impl/src/plumbing.rs

@@ -593,18 +593,6 @@ macro_rules! define_queries {
                 }
             }
 
-            pub(crate) fn alloc_self_profile_query_strings<'tcx>(
-                tcx: TyCtxt<'tcx>,
-                string_cache: &mut QueryKeyStringCache
-            ) {
-                $crate::profiling_support::alloc_self_profile_query_strings_for_query_cache(
-                    tcx,
-                    stringify!($name),
-                    &tcx.query_system.query_vtables.$name.cache,
-                    string_cache,
-                )
-            }
-
             item_if_cache_on_disk! { [$($modifiers)*]
                 pub(crate) fn encode_query_results<'tcx>(
                     tcx: TyCtxt<'tcx>,
@@ -663,9 +651,33 @@ macro_rules! define_queries {
             if complete { Ok(job_map_out) } else { Err(job_map_out) }
         }
 
-        const ALLOC_SELF_PROFILE_QUERY_STRINGS: &[
-            for<'tcx> fn(TyCtxt<'tcx>, &mut QueryKeyStringCache)
-        ] = &[$(query_impl::$name::alloc_self_profile_query_strings),*];
+        /// All self-profiling events generated by the query engine use
+        /// virtual `StringId`s for their `event_id`. This method makes all
+        /// those virtual `StringId`s point to actual strings.
+        ///
+        /// If we are recording only summary data, the ids will point to
+        /// just the query names. If we are recording query keys too, we
+        /// allocate the corresponding strings here.
+        pub fn alloc_self_profile_query_strings(tcx: TyCtxt<'_>) {
+            if !tcx.prof.enabled() {
+                return;
+            }
+
+            let _prof_timer = tcx.sess.prof.generic_activity("self_profile_alloc_query_strings");
+
+            let mut string_cache = QueryKeyStringCache::new();
+
+            $(
+                $crate::profiling_support::alloc_self_profile_query_strings_for_query_cache(
+                    tcx,
+                    stringify!($name),
+                    &tcx.query_system.query_vtables.$name.cache,
+                    &mut string_cache,
+                );
+            )*
+
+            tcx.sess.prof.store_query_cache_hits();
+        }
 
         const ENCODE_QUERY_RESULTS: &[
             Option<for<'tcx> fn(

compiler/rustc_query_impl/src/profiling_support.rs

@@ -14,7 +14,7 @@ pub(crate) struct QueryKeyStringCache {
 }
 
 impl QueryKeyStringCache {
-    fn new() -> QueryKeyStringCache {
+    pub(crate) fn new() -> QueryKeyStringCache {
         QueryKeyStringCache { def_id_cache: Default::default() }
     }
 }
@@ -239,25 +239,3 @@ pub(crate) fn alloc_self_profile_query_strings_for_query_cache<'tcx, C>(
         }
     });
 }
-
-/// All self-profiling events generated by the query engine use
-/// virtual `StringId`s for their `event_id`. This method makes all
-/// those virtual `StringId`s point to actual strings.
-///
-/// If we are recording only summary data, the ids will point to
-/// just the query names. If we are recording query keys too, we
-/// allocate the corresponding strings here.
-pub fn alloc_self_profile_query_strings(tcx: TyCtxt<'_>) {
-    if !tcx.prof.enabled() {
-        return;
-    }
-
-    let _prof_timer = tcx.sess.prof.generic_activity("self_profile_alloc_query_strings");
-
-    let mut string_cache = QueryKeyStringCache::new();
-
-    for alloc in super::ALLOC_SELF_PROFILE_QUERY_STRINGS.iter() {
-        alloc(tcx, &mut string_cache)
-    }
-    tcx.sess.prof.store_query_cache_hits();
-}