address review: full tsx not always needed

Author: LorrensP-2158466

compiler/rustc_metadata/src/creader.rs

@@ -22,8 +22,10 @@ use rustc_middle::bug;
 use rustc_middle::ty::data_structures::IndexSet;
 use rustc_middle::ty::{TyCtxt, TyCtxtFeed};
 use rustc_proc_macro::bridge::client::ProcMacro;
+use rustc_session::Session;
 use rustc_session::config::{
- CrateType, ExtendedTargetModifierInfo, ExternLocation, OptionsTargetModifiers, TargetModifier,
+ CrateType, ExtendedTargetModifierInfo, ExternLocation, Externs, OptionsTargetModifiers,
+ TargetModifier,
 };
 use rustc_session::cstore::{CrateDepKind, CrateSource, ExternCrate, ExternCrateSource};
 use rustc_session::lint::{self, BuiltinLintDiag};
@@ -480,7 +482,7 @@ impl CStore {
 
  fn existing_match(
  &self,
- tcx: TyCtxt<'_>,
+ externs: &Externs,
  name: Symbol,
  hash: Option<Svh>,
  kind: PathKind,
@@ -510,7 +512,7 @@ impl CStore {
  // `source` stores paths which are normalized which may be different
  // from the strings on the command line.
  let source = self.get_crate_data(cnum).cdata.source();
- if let Some(entry) = tcx.sess.opts.externs.get(name.as_str()) {
+ if let Some(entry) = externs.get(name.as_str()) {
  // Only use `--extern crate_name=path` here, not `--extern crate_name`.
  if let Some(mut files) = entry.files() {
  if files.any(|l| {
@@ -561,9 +563,9 @@ impl CStore {
  /// Sometimes the directly dependent crate is not specified by `--extern`, in this case,
  /// `private-dep` is none during loading. This is equivalent to the scenario where the
  /// command parameter is set to `public-dependency`
- fn is_private_dep<'tcx>(
+ fn is_private_dep(
  &self,
- tcx: TyCtxt<'tcx>,
+ externs: &Externs,
  name: Symbol,
  private_dep: Option<bool>,
  origin: CrateOrigin<'_>,
@@ -572,7 +574,7 @@ impl CStore {
  return true;
  }
 
- let extern_private = tcx.sess.opts.externs.get(name.as_str()).map(|e| e.is_private_dep);
+ let extern_private = externs.get(name.as_str()).map(|e| e.is_private_dep);
  match (extern_private, private_dep) {
  // Explicit non-private via `--extern`, explicit non-private from metadata, or
  // unspecified with default to public.
@@ -598,7 +600,7 @@ impl CStore {
  let Library { source, metadata } = lib;
  let crate_root = metadata.get_root();
  let host_hash = host_lib.as_ref().map(|lib| lib.metadata.get_root().hash());
- let private_dep = self.is_private_dep(tcx, name, private_dep, origin);
+ let private_dep = self.is_private_dep(&tcx.sess.opts.externs, name, private_dep, origin);
 
  // Claim this crate number and cache it
  let feed = self.intern_stable_crate_id(tcx, &crate_root)?;
@@ -641,7 +643,7 @@ impl CStore {
  None => (&source, &crate_root),
  };
  let dlsym_dylib = dlsym_source.dylib.as_ref().expect("no dylib for a proc-macro crate");
- Some(self.dlsym_proc_macros(tcx, &dlsym_dylib.0, dlsym_root.stable_crate_id())?)
+ Some(self.dlsym_proc_macros(tcx.sess, &dlsym_dylib.0, dlsym_root.stable_crate_id())?)
  } else {
  None
  };
@@ -665,24 +667,24 @@ impl CStore {
  Ok(cnum)
  }
 
- fn load_proc_macro<'b, 'tcx>(
+ fn load_proc_macro<'a, 'b>(
  &self,
- tcx: TyCtxt<'tcx>,
+ sess: &'a Session,
  locator: &mut CrateLocator<'b>,
  crate_rejections: &mut CrateRejections,
  path_kind: PathKind,
  host_hash: Option<Svh>,
  ) -> Result<Option<(LoadResult, Option<Library>)>, CrateError>
  where
- 'tcx: 'b,
+ 'a: 'b,
  {
- if tcx.sess.opts.unstable_opts.dual_proc_macros {
+ if sess.opts.unstable_opts.dual_proc_macros {
  // Use a new crate locator and crate rejections so trying to load a proc macro doesn't
  // affect the error message we emit
  let mut proc_macro_locator = locator.clone();
 
  // Try to load a proc macro
- proc_macro_locator.for_target_proc_macro(tcx.sess, path_kind);
+ proc_macro_locator.for_target_proc_macro(sess, path_kind);
 
  // Load the proc macro crate for the target
  let target_result =
@@ -699,7 +701,7 @@ impl CStore {
  *crate_rejections = CrateRejections::default();
 
  // Load the proc macro crate for the host
- locator.for_proc_macro(tcx.sess, path_kind);
+ locator.for_proc_macro(sess, path_kind);
 
  locator.hash = host_hash;
 
@@ -720,7 +722,7 @@ impl CStore {
  let mut proc_macro_locator = locator.clone();
 
  // Load the proc macro crate for the host
- proc_macro_locator.for_proc_macro(tcx.sess, path_kind);
+ proc_macro_locator.for_proc_macro(sess, path_kind);
 
  let Some(host_result) =
  self.load(&mut proc_macro_locator, &mut CrateRejections::default())?
@@ -782,7 +784,9 @@ impl CStore {
  let path_kind = if dep.is_some() { PathKind::Dependency } else { PathKind::Crate };
  let private_dep = origin.private_dep();
 
- let result = if let Some(cnum) = self.existing_match(tcx, name, hash, path_kind) {
+ let result = if let Some(cnum) =
+ self.existing_match(&tcx.sess.opts.externs, name, hash, path_kind)
+ {
  (LoadResult::Previous(cnum), None)
  } else {
  info!("falling back to a load");
@@ -805,7 +809,7 @@ impl CStore {
  info!("falling back to loading proc_macro");
  dep_kind = CrateDepKind::MacrosOnly;
  match self.load_proc_macro(
- tcx,
+ tcx.sess,
  &mut locator,
  &mut crate_rejections,
  path_kind,
@@ -825,7 +829,8 @@ impl CStore {
  // not specified by `--extern` on command line parameters, it may be
  // `private-dependency` when `register_crate` is called for the first time. Then it must be updated to
  // `public-dependency` here.
- let private_dep = self.is_private_dep(tcx, name, private_dep, origin);
+ let private_dep =
+ self.is_private_dep(&tcx.sess.opts.externs, name, private_dep, origin);
  let data = self.get_crate_data_mut(cnum);
  if data.is_proc_macro_crate() {
  dep_kind = CrateDepKind::MacrosOnly;
@@ -924,13 +929,13 @@ impl CStore {
  Ok(crate_num_map)
  }
 
- fn dlsym_proc_macros<'tcx>(
+ fn dlsym_proc_macros(
  &self,
- tcx: TyCtxt<'tcx>,
+ sess: &Session,
  path: &Path,
  stable_crate_id: StableCrateId,
  ) -> Result<&'static [ProcMacro], CrateError> {
- let sym_name = tcx.sess.generate_proc_macro_decls_symbol(stable_crate_id);
+ let sym_name = sess.generate_proc_macro_decls_symbol(stable_crate_id);
  debug!("trying to dlsym proc_macros {} for symbol `{}`", path.display(), sym_name);
 
  unsafe {