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

Feed the output filenames into the TyCtxt

Browse Source 
Since the introduction of the crate attribute pre-expansion pass we
don't need access to the TyCtxt to compute it.
This commit is contained in:
bjorn3 2023-11-04 15:59:29 +00:00
parent 98a6eaa7f8
commit 4acaa0284e
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_driver_impl/src/lib.rs
View File

@ -401,9 +401,9 @@ fn run_compiler(
Ok(())
})?;
// Make sure the `output_filenames` query is run for its side
// Make sure the `write_dep_info` query is run for its side
// effects of writing the dep-info and reporting errors.
queries.global_ctxt()?.enter(|tcx| tcx.output_filenames(()));
queries.global_ctxt()?.enter(|tcx| tcx.write_dep_info(()));
} else {
let krate = queries.parse()?;
pretty::print(
@ -431,9 +431,9 @@ fn run_compiler(
return early_exit();
}
// Make sure the `output_filenames` query is run for its side
// Make sure the `write_dep_info` query is run for its side
// effects of writing the dep-info and reporting errors.
queries.global_ctxt()?.enter(|tcx| tcx.output_filenames(()));
queries.global_ctxt()?.enter(|tcx| tcx.write_dep_info(()));
if sess.opts.output_types.contains_key(&OutputType::DepInfo)
&& sess.opts.output_types.len() == 1

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

@ -39,7 +39,7 @@
use std::ffi::OsString;
use std::io::{self, BufWriter, Write};
use std::path::{Path, PathBuf};
use std::sync::{Arc, LazyLock};
use std::sync::LazyLock;
use std::{env, fs, iter};
pub fn parse<'a>(sess: &'a Session) -> PResult<'a, ast::Crate> {
@ -553,12 +553,12 @@ fn resolver_for_lowering<'tcx>(
tcx.arena.alloc(Steal::new((untracked_resolver_for_lowering, Lrc::new(krate))))
}
fn output_filenames(tcx: TyCtxt<'_>, (): ()) -> Arc<OutputFilenames> {
fn write_dep_info(tcx: TyCtxt<'_>, (): ()) {
let sess = tcx.sess;
let _timer = sess.timer("prepare_outputs");
let _timer = sess.timer("write_dep_info");
let crate_name = tcx.crate_name(LOCAL_CRATE);
let outputs = util::build_output_filenames(sess, crate_name.to_string());
let outputs = tcx.output_filenames(());
let output_paths =
generated_output_paths(tcx, &outputs, sess.io.output_file.is_some(), crate_name);
@ -595,15 +595,13 @@ fn output_filenames(tcx: TyCtxt<'_>, (): ()) -> Arc<OutputFilenames> {
}
}
}
outputs.into()
}
pub static DEFAULT_QUERY_PROVIDERS: LazyLock<Providers> = LazyLock::new(|| {
let providers = &mut Providers::default();
providers.analysis = analysis;
providers.hir_crate = rustc_ast_lowering::lower_to_hir;
providers.output_filenames = output_filenames;
providers.write_dep_info = write_dep_info;
providers.resolver_for_lowering = resolver_for_lowering;
providers.early_lint_checks = early_lint_checks;
proc_macro_decls::provide(providers);

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

@ -135,6 +135,7 @@ pub fn global_ctxt(&'tcx self) -> Result<QueryResult<'_, &'tcx GlobalCtxt<'tcx>>
sess.opts.cg.metadata.clone(),
sess.cfg_version,
);
let outputs = util::build_output_filenames(sess, crate_name.to_string());
let dep_graph = setup_dep_graph(sess, crate_name, stable_crate_id)?;
let cstore = FreezeLock::new(Box::new(CStore::new(
@ -169,6 +170,7 @@ pub fn global_ctxt(&'tcx self) -> Result<QueryResult<'_, &'tcx GlobalCtxt<'tcx>>
crate_name,
)));
feed.crate_for_resolver(tcx.arena.alloc(Steal::new((krate, pre_configured_attrs))));
feed.output_filenames(Arc::new(outputs));
});
Ok(qcx)
})

5
compiler/rustc_middle/src/query/mod.rs
View File

@ -1916,6 +1916,11 @@
arena_cache
}
/// Write the dep-info file.
query write_dep_info(_: ()) -> () {
desc { "writing the dep-info file" }
}
/// Do not call this query directly: invoke `normalize` instead.
query normalize_projection_ty(
goal: CanonicalProjectionGoal<'tcx>