nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-21 19:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Let several methods take &Resolver instead of a BoxedResolver wrapper"

Browse Source 
This reverts commit 5343ec338f72a61e2f51f9d90117092c8e8a725a.
This commit is contained in:
bjorn3 2021-06-01 11:51:32 +02:00
parent 5e148200d4
commit cf1f92a2ca
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ use rustc_ast::{self as ast, visit};
use rustc_codegen_ssa::back::link::emit_metadata;
use rustc_codegen_ssa::traits::CodegenBackend;
use rustc_data_structures::parallel;
use rustc_data_structures::steal::Steal;
use rustc_data_structures::sync::{par_iter, Lrc, OnceCell, ParallelIterator, WorkerLocal};
use rustc_data_structures::temp_dir::MaybeTempDir;
use rustc_errors::{ErrorReported, PResult};
@ -270,7 +271,7 @@ fn pre_expansion_lint(
fn configure_and_expand_inner<'a>(
sess: &'a Session,
lint_store: &LintStore,
lint_store: &'a LintStore,
mut krate: ast::Crate,
crate_name: &str,
resolver_arenas: &'a ResolverArenas<'a>,
@ -593,7 +594,7 @@ fn escape_dep_env(symbol: Symbol) -> String {
fn write_out_deps(
sess: &Session,
resolver: &Resolver<'_>,
boxed_resolver: &Steal<Rc<RefCell<BoxedResolver>>>,
outputs: &OutputFilenames,
out_filenames: &[PathBuf],
) {
@ -620,18 +621,20 @@ fn write_out_deps(
}
if sess.binary_dep_depinfo() {
for cnum in resolver.cstore().crates_untracked() {
let source = resolver.cstore().crate_source_untracked(cnum);
if let Some((path, _)) = source.dylib {
files.push(escape_dep_filename(&path.display().to_string()));
boxed_resolver.borrow().borrow_mut().access(|resolver| {
for cnum in resolver.cstore().crates_untracked() {
let source = resolver.cstore().crate_source_untracked(cnum);
if let Some((path, _)) = source.dylib {
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)?);
@ -687,7 +690,7 @@ pub fn prepare_outputs(
sess: &Session,
compiler: &Compiler,
krate: &ast::Crate,
resolver: &Resolver<'_>,
boxed_resolver: &Steal<Rc<RefCell<BoxedResolver>>>,
crate_name: &str,
) -> Result<OutputFilenames> {
let _timer = sess.timer("prepare_outputs");
@ -727,7 +730,7 @@ pub fn prepare_outputs(
}
}
write_out_deps(sess, resolver, &outputs, &output_paths);
write_out_deps(sess, boxed_resolver, &outputs, &output_paths);
let only_dep_info = sess.opts.output_types.contains_key(&OutputType::DepInfo)
&& sess.opts.output_types.len() == 1;

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

@ -246,20 +246,13 @@ impl<'tcx> Queries<'tcx> {
let expansion_result = self.expansion()?;
let (krate, boxed_resolver, _) = &*expansion_result.peek();
let crate_name = self.crate_name()?.peek();
// These borrow(), borrow_mut() and access() calls are separate statements to prevent a
// "temporary value dropped while borrowed" error.
let boxed_resolver = boxed_resolver.borrow();
let mut boxed_resolver = boxed_resolver.borrow_mut();
boxed_resolver.access(|resolver| {
passes::prepare_outputs(
self.session(),
self.compiler,
&krate,
resolver,
&crate_name,
)
})
passes::prepare_outputs(
self.session(),
self.compiler,
&krate,
&boxed_resolver,
&crate_name,
)
})
}