Rollup merge of rust-lang#109137 - petrochenkov:qcstore2, r=cjgillot

resolve: Querify most cstore access methods (subset 2)

These changes are less likely to cause perf regressions than the rest of rust-lang#108346.

compiler/rustc_metadata/src/rmeta/decoder.rs

@@ -925,10 +925,6 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
  tcx.mk_adt_def(did, adt_kind, variants, repr)
  }
 
- fn get_generics(self, item_id: DefIndex, sess: &Session) -> ty::Generics {
- self.root.tables.generics_of.get(self, item_id).unwrap().decode((self, sess))
- }
-
  fn get_visibility(self, id: DefIndex) -> Visibility<DefId> {
  self.root
  .tables

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -545,10 +545,6 @@ impl CStore {
  self.get_crate_data(def.krate).def_kind(def.index)
  }
 
- pub fn item_generics_num_lifetimes(&self, def_id: DefId, sess: &Session) -> usize {
- self.get_crate_data(def_id.krate).get_generics(def_id.index, sess).own_counts().lifetimes
- }
-
  pub fn module_expansion_untracked(&self, def_id: DefId, sess: &Session) -> ExpnId {
  self.get_crate_data(def_id.krate).module_expansion(def_id.index, sess)
  }
@@ -560,14 +556,6 @@ impl CStore {
  self.get_crate_data(cnum).num_def_ids()
  }
 
- pub fn item_attrs_untracked<'a>(
- &'a self,
- def_id: DefId,
- sess: &'a Session,
- ) -> impl Iterator<Item = ast::Attribute> + 'a {
- self.get_crate_data(def_id.krate).get_item_attrs(def_id.index, sess)
- }
-
  pub fn get_proc_macro_quoted_span_untracked(
  &self,
  cnum: CrateNum,

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -27,7 +27,6 @@ use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_ID};
 use rustc_metadata::creader::LoadedMacro;
 use rustc_middle::metadata::ModChild;
 use rustc_middle::{bug, ty};
-use rustc_session::cstore::CrateStore;
 use rustc_span::hygiene::{ExpnId, LocalExpnId, MacroKind};
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::Span;
@@ -116,33 +115,24 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
 
  if !def_id.is_local() {
  let def_kind = self.cstore().def_kind(def_id);
- match def_kind {
- DefKind::Mod | DefKind::Enum | DefKind::Trait => {
- let def_key = self.cstore().def_key(def_id);
- let parent = def_key.parent.map(|index| {
- self.get_nearest_non_block_module(DefId { index, krate: def_id.krate })
- });
- let name = if let Some(cnum) = def_id.as_crate_root() {
- self.cstore().crate_name(cnum)
- } else {
- def_key.disambiguated_data.data.get_opt_name().expect("module without name")
- };
-
- let expn_id = self.cstore().module_expansion_untracked(def_id, &self.tcx.sess);
- Some(self.new_module(
- parent,
- ModuleKind::Def(def_kind, def_id, name),
- expn_id,
- self.def_span(def_id),
- // FIXME: Account for `#[no_implicit_prelude]` attributes.
- parent.map_or(false, |module| module.no_implicit_prelude),
- ))
- }
- _ => None,
+ if let DefKind::Mod | DefKind::Enum | DefKind::Trait = def_kind {
+ let parent = self
+ .tcx
+ .opt_parent(def_id)
+ .map(|parent_id| self.get_nearest_non_block_module(parent_id));
+ let expn_id = self.cstore().module_expansion_untracked(def_id, &self.tcx.sess);
+ return Some(self.new_module(
+ parent,
+ ModuleKind::Def(def_kind, def_id, self.tcx.item_name(def_id)),
+ expn_id,
+ self.def_span(def_id),
+ // FIXME: Account for `#[no_implicit_prelude]` attributes.
+ parent.map_or(false, |module| module.no_implicit_prelude),
+ ));
  }
- } else {
- None
  }
+
+ None
  }
 
  pub(crate) fn expn_def_scope(&mut self, expn_id: ExpnId) -> Module<'a> {

compiler/rustc_resolve/src/lib.rs

@@ -1168,7 +1168,7 @@ impl<'tcx> Resolver<'_, 'tcx> {
  if let Some(def_id) = def_id.as_local() {
  self.item_generics_num_lifetimes[&def_id]
  } else {
- self.cstore().item_generics_num_lifetimes(def_id, self.tcx.sess)
+ self.tcx.generics_of(def_id).own_counts().lifetimes
  }
  }
 
@@ -1906,10 +1906,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
  return v.clone();
  }
 
- let attr = self
- .cstore()
- .item_attrs_untracked(def_id, self.tcx.sess)
- .find(|a| a.has_name(sym::rustc_legacy_const_generics))?;
+ let attr = self.tcx.get_attr(def_id, sym::rustc_legacy_const_generics)?;
  let mut ret = Vec::new();
  for meta in attr.meta_item_list()? {
  match meta.lit()?.kind {