bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reduce the amount of GlobalCtxt::enter calls in the driver

Browse source 
We now only exit the GlobalCtxt when calling a callback and all the way
at the end when the GlobalCtxt is about to be destroyed.
This commit is contained in:
bjorn3 2023-11-26 20:43:34 +00:00
parent 8e9bbc899c
commit 1eece7478d
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_driver_impl/src/lib.rs
View file

@ -396,10 +396,6 @@ fn run_compiler(
queries.global_ctxt()?.enter(|tcx| { queries.global_ctxt()?.enter(|tcx| {
tcx.ensure().early_lint_checks(()); tcx.ensure().early_lint_checks(());
pretty::print(sess, pp_mode, pretty::PrintExtra::NeedsAstMap { tcx }); pretty::print(sess, pp_mode, pretty::PrintExtra::NeedsAstMap { tcx });
Ok(())
})?;
queries.global_ctxt()?.enter(|tcx| {
passes::write_dep_info(tcx); passes::write_dep_info(tcx);
}); });
} else { } else {
@ -429,19 +425,19 @@ fn run_compiler(
queries.global_ctxt()?.enter(|tcx| { queries.global_ctxt()?.enter(|tcx| {
passes::write_dep_info(tcx); passes::write_dep_info(tcx);
});
if sess.opts.output_types.contains_key(&OutputType::DepInfo) if sess.opts.output_types.contains_key(&OutputType::DepInfo)
&& sess.opts.output_types.len() == 1 && sess.opts.output_types.len() == 1
{ {
return early_exit(); return early_exit();
} }
if sess.opts.unstable_opts.no_analysis { if sess.opts.unstable_opts.no_analysis {
return early_exit(); return early_exit();
} }
queries.global_ctxt()?.enter(|tcx| tcx.analysis(()))?; tcx.analysis(())?;
})?;
if callbacks.after_analysis(compiler, queries) == Compilation::Stop { if callbacks.after_analysis(compiler, queries) == Compilation::Stop {
return early_exit(); return early_exit();