mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove another unneeded use of the resolver

Browse Source
This commit is contained in:
Oli Scherer 2022-12-07 09:33:25 +00:00
parent 6b3cd03fdb
commit abee6137f7
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler/rustc_interface/src/passes.rs
View File

@ -30,7 +30,7 @@ use rustc_plugin_impl as plugin;
use rustc_query_impl::{OnDiskCache, Queries as TcxQueries}; use rustc_query_impl::{OnDiskCache, Queries as TcxQueries};
use rustc_resolve::{Resolver, ResolverArenas}; use rustc_resolve::{Resolver, ResolverArenas};
use rustc_session::config::{CrateType, Input, OutputFilenames, OutputType}; use rustc_session::config::{CrateType, Input, OutputFilenames, OutputType};
use rustc_session::cstore::{MetadataLoader, MetadataLoaderDyn, Untracked}; use rustc_session::cstore::{CrateStoreDyn, MetadataLoader, MetadataLoaderDyn, Untracked};
use rustc_session::output::filename_for_input; use rustc_session::output::filename_for_input;
use rustc_session::search_paths::PathKind; use rustc_session::search_paths::PathKind;
use rustc_session::{Limit, Session}; use rustc_session::{Limit, Session};
@ -548,7 +548,7 @@ fn escape_dep_env(symbol: Symbol) -> String {
fn write_out_deps( fn write_out_deps(
sess: &Session, sess: &Session,
boxed_resolver: &RefCell<BoxedResolver>, cstore: &CrateStoreDyn,
outputs: &OutputFilenames, outputs: &OutputFilenames,
out_filenames: &[PathBuf], out_filenames: &[PathBuf],
) { ) {
@ -600,20 +600,19 @@ fn write_out_deps(
} }
} }
boxed_resolver.borrow_mut().access(|resolver| { let cstore = cstore.as_any().downcast_ref::<CStore>().unwrap();
for cnum in resolver.cstore().crates_untracked() { for cnum in cstore.crates_untracked() {
let source = resolver.cstore().crate_source_untracked(cnum); let source = cstore.crate_source_untracked(cnum);
if let Some((path, _)) = &source.dylib { if let Some((path, _)) = &source.dylib {
files.push(escape_dep_filename(&path.display().to_string())); files.push(escape_dep_filename(&path.display().to_string()));
}
if let Some((path, _)) = &source.rlib {
files.push(escape_dep_filename(&path.display().to_string()));
}
if let Some((path, _)) = &source.rmeta {
files.push(escape_dep_filename(&path.display().to_string()));
}
} }
}); if let Some((path, _)) = &source.rlib {
files.push(escape_dep_filename(&path.display().to_string()));
}
if let Some((path, _)) = &source.rmeta {
files.push(escape_dep_filename(&path.display().to_string()));
}
}
} }
let mut file = BufWriter::new(fs::File::create(&deps_filename)?); let mut file = BufWriter::new(fs::File::create(&deps_filename)?);
@ -664,7 +663,7 @@ fn write_out_deps(
pub fn prepare_outputs( pub fn prepare_outputs(
sess: &Session, sess: &Session,
krate: &ast::Crate, krate: &ast::Crate,
boxed_resolver: &RefCell<BoxedResolver>, cstore: &CrateStoreDyn,
crate_name: Symbol, crate_name: Symbol,
) -> Result<OutputFilenames> { ) -> Result<OutputFilenames> {
let _timer = sess.timer("prepare_outputs"); let _timer = sess.timer("prepare_outputs");
@ -697,7 +696,7 @@ pub fn prepare_outputs(
} }
} }
write_out_deps(sess, boxed_resolver, &outputs, &output_paths); write_out_deps(sess, cstore, &outputs, &output_paths);
let only_dep_info = sess.opts.output_types.contains_key(&OutputType::DepInfo) let only_dep_info = sess.opts.output_types.contains_key(&OutputType::DepInfo)
&& sess.opts.output_types.len() == 1; && sess.opts.output_types.len() == 1;

9
compiler/rustc_interface/src/queries.rs
View File

@ -212,8 +212,6 @@ impl<'tcx> Queries<'tcx> {
let crate_name = *self.crate_name()?.borrow(); let crate_name = *self.crate_name()?.borrow();
let (krate, resolver, lint_store) = self.expansion()?.steal(); let (krate, resolver, lint_store) = self.expansion()?.steal();
let outputs = passes::prepare_outputs(self.session(), &krate, &resolver, crate_name)?;
let ty::ResolverOutputs { let ty::ResolverOutputs {
untracked, untracked,
global_ctxt: untracked_resolutions, global_ctxt: untracked_resolutions,
@ -237,6 +235,13 @@ impl<'tcx> Queries<'tcx> {
tcx.arena.alloc(Steal::new((untracked_resolver_for_lowering, krate))), tcx.arena.alloc(Steal::new((untracked_resolver_for_lowering, krate))),
); );
feed.resolutions(tcx.arena.alloc(untracked_resolutions)); feed.resolutions(tcx.arena.alloc(untracked_resolutions));
let outputs = passes::prepare_outputs(
self.session(),
&krate,
&*untracked.cstore,
crate_name,
)?;
feed.output_filenames(tcx.arena.alloc(std::sync::Arc::new(outputs))); feed.output_filenames(tcx.arena.alloc(std::sync::Arc::new(outputs)));
feed.features_query(tcx.sess.features_untracked()); feed.features_query(tcx.sess.features_untracked());
let feed = tcx.feed_local_crate(); let feed = tcx.feed_local_crate();