Auto merge of #89978 - cjgillot:qarray, r=Mark-Simulacrum

Merge the two depkind vtables Knowledge of `DepKind`s is managed using two arrays containing flags (is_anon, eval_always, fingerprint_style), and function pointers (forcing and loading code). This PR aims at merging the two arrays so as to reduce unneeded indirect calls and (hopefully) increase code locality. r? `@ghost`

Author: bors

Cargo.lock

@@ -4319,7 +4319,6 @@ dependencies = [
  "rustc_serialize",
  "rustc_session",
  "rustc_span",
- "tracing",
 ]
 
 [[package]]

compiler/rustc_codegen_cranelift/src/driver/aot.rs

@@ -224,7 +224,7 @@ pub(crate) fn run_aot(
  tcx,
  (backend_config.clone(), cgu.name()),
  module_codegen,
- rustc_middle::dep_graph::hash_result,
+ Some(rustc_middle::dep_graph::hash_result),
  );
 
  if let Some((id, product)) = work_product {

compiler/rustc_codegen_gcc/src/base.rs

@@ -59,7 +59,13 @@ pub fn compile_codegen_unit<'tcx>(tcx: TyCtxt<'tcx>, cgu_name: Symbol) -> (Modul
  let start_time = Instant::now();
 
  let dep_node = tcx.codegen_unit(cgu_name).codegen_dep_node(tcx);
- let (module, _) = tcx.dep_graph.with_task(dep_node, tcx, cgu_name, module_codegen, dep_graph::hash_result);
+ let (module, _) = tcx.dep_graph.with_task(
+ dep_node,
+ tcx,
+ cgu_name,
+ module_codegen,
+ Some(dep_graph::hash_result),
+ );
  let time_to_codegen = start_time.elapsed();
  drop(prof_timer);
 

compiler/rustc_codegen_llvm/src/base.rs

@@ -113,8 +113,13 @@ pub fn compile_codegen_unit(
  let start_time = Instant::now();
 
  let dep_node = tcx.codegen_unit(cgu_name).codegen_dep_node(tcx);
- let (module, _) =
- tcx.dep_graph.with_task(dep_node, tcx, cgu_name, module_codegen, dep_graph::hash_result);
+ let (module, _) = tcx.dep_graph.with_task(
+ dep_node,
+ tcx,
+ cgu_name,
+ module_codegen,
+ Some(dep_graph::hash_result),
+ );
  let time_to_codegen = start_time.elapsed();
 
  // We assume that the cost to run LLVM on a CGU is proportional to

compiler/rustc_incremental/src/assert_dep_graph.rs

@@ -126,30 +126,36 @@ impl IfThisChanged<'tcx> {
  if attr.has_name(sym::rustc_if_this_changed) {
  let dep_node_interned = self.argument(attr);
  let dep_node = match dep_node_interned {
- None => DepNode::from_def_path_hash(def_path_hash, DepKind::hir_owner),
- Some(n) => match DepNode::from_label_string(&n.as_str(), def_path_hash) {
- Ok(n) => n,
- Err(()) => {
- self.tcx.sess.span_fatal(
- attr.span,
- &format!("unrecognized DepNode variant {:?}", n),
- );
+ None => {
+ DepNode::from_def_path_hash(self.tcx, def_path_hash, DepKind::hir_owner)
+ }
+ Some(n) => {
+ match DepNode::from_label_string(self.tcx, &n.as_str(), def_path_hash) {
+ Ok(n) => n,
+ Err(()) => {
+ self.tcx.sess.span_fatal(
+ attr.span,
+ &format!("unrecognized DepNode variant {:?}", n),
+ );
+ }
  }
- },
+ }
  };
  self.if_this_changed.push((attr.span, def_id.to_def_id(), dep_node));
  } else if attr.has_name(sym::rustc_then_this_would_need) {
  let dep_node_interned = self.argument(attr);
  let dep_node = match dep_node_interned {
- Some(n) => match DepNode::from_label_string(&n.as_str(), def_path_hash) {
- Ok(n) => n,
- Err(()) => {
- self.tcx.sess.span_fatal(
- attr.span,
- &format!("unrecognized DepNode variant {:?}", n),
- );
+ Some(n) => {
+ match DepNode::from_label_string(self.tcx, &n.as_str(), def_path_hash) {
+ Ok(n) => n,
+ Err(()) => {
+ self.tcx.sess.span_fatal(
+ attr.span,
+ &format!("unrecognized DepNode variant {:?}", n),
+ );
+ }
  }
- },
+ }
  None => {
  self.tcx.sess.span_fatal(attr.span, "missing DepNode variant");
  }

compiler/rustc_incremental/src/persist/dirty_clean.rs

@@ -15,7 +15,7 @@
 use rustc_ast::{self as ast, Attribute, NestedMetaItem};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
-use rustc_hir::def_id::{DefId, LocalDefId};
+use rustc_hir::def_id::LocalDefId;
 use rustc_hir::intravisit;
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::Node as HirNode;
@@ -302,18 +302,6 @@ impl DirtyCleanVisitor<'tcx> {
  out
  }
 
- fn dep_nodes<'l>(
- &self,
- labels: &'l Labels,
- def_id: DefId,
- ) -> impl Iterator<Item = DepNode> + 'l {
- let def_path_hash = self.tcx.def_path_hash(def_id);
- labels.iter().map(move |label| match DepNode::from_label_string(label, def_path_hash) {
- Ok(dep_node) => dep_node,
- Err(()) => unreachable!("label: {}", label),
- })
- }
-
  fn dep_node_str(&self, dep_node: &DepNode) -> String {
  if let Some(def_id) = dep_node.extract_def_id(self.tcx) {
  format!("{:?}({})", dep_node.kind, self.tcx.def_path_str(def_id))
@@ -345,16 +333,19 @@ impl DirtyCleanVisitor<'tcx> {
  }
 
  fn check_item(&mut self, item_id: LocalDefId, item_span: Span) {
+ let def_path_hash = self.tcx.def_path_hash(item_id.to_def_id());
  for attr in self.tcx.get_attrs(item_id.to_def_id()).iter() {
  let assertion = match self.assertion_maybe(item_id, attr) {
  Some(a) => a,
  None => continue,
  };
  self.checked_attrs.insert(attr.id);
- for dep_node in self.dep_nodes(&assertion.clean, item_id.to_def_id()) {
+ for label in assertion.clean {
+ let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
  self.assert_clean(item_span, dep_node);
  }
- for dep_node in self.dep_nodes(&assertion.dirty, item_id.to_def_id()) {
+ for label in assertion.dirty {
+ let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
  self.assert_dirty(item_span, dep_node);
  }
  }

compiler/rustc_interface/src/passes.rs

@@ -838,6 +838,7 @@ pub fn create_global_ctxt<'tcx>(
  dep_graph,
  queries.on_disk_cache.as_ref().map(OnDiskCache::as_dyn),
  queries.as_dyn(),
+ rustc_query_impl::query_callbacks(arena),
  crate_name,
  outputs,
  )

compiler/rustc_middle/src/arena.rs

@@ -100,6 +100,8 @@ macro_rules! arena_types {
  // This is used to decode the &'tcx [Span] for InlineAsm's line_spans.
  [decode] span: rustc_span::Span,
  [decode] used_trait_imports: rustc_data_structures::fx::FxHashSet<rustc_hir::def_id::LocalDefId>,
+
+ [] dep_kind: rustc_middle::dep_graph::DepKindStruct,
  ], $tcx);
  )
 }