rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge two consecutive tcx.analysis() calls

Browse Source
This commit is contained in:
bjorn3
2021-03-28 18:30:25 +02:00
parent 32d3276561
commit cab940e848
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_driver/src/lib.rs
View File

@@ -411,11 +411,10 @@ fn run_compiler(
return early_exit(); return early_exit();
} }
if sess.opts.debugging_opts.save_analysis { let crate_name = queries.crate_name()?.peek().clone();
let crate_name = queries.crate_name()?.peek().clone(); queries.global_ctxt()?.peek_mut().enter(|tcx| {
queries.global_ctxt()?.peek_mut().enter(|tcx| { let result = tcx.analysis(LOCAL_CRATE);
let result = tcx.analysis(LOCAL_CRATE); if sess.opts.debugging_opts.save_analysis {
sess.time("save_analysis", || { sess.time("save_analysis", || {
save::process_crate( save::process_crate(
tcx, tcx,
@@ -428,12 +427,9 @@ fn run_compiler(
), ),
) )
}); });
}
result result
})?; })?;
}
queries.global_ctxt()?.peek_mut().enter(|tcx| tcx.analysis(LOCAL_CRATE))?;
if callbacks.after_analysis(compiler, queries) == Compilation::Stop { if callbacks.after_analysis(compiler, queries) == Compilation::Stop {
return early_exit(); return early_exit();