Skip to content

rustc_driver cleanup #83610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 12, 2021
Merged

rustc_driver cleanup #83610

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cab940e
Merge two consecutive tcx.analysis() calls
bjorn3 Mar 28, 2021
b5e049d
Remove dummy_config
bjorn3 Mar 28, 2021
2fa7175
Document a few things
bjorn3 Mar 28, 2021
2acdc87
Inline process_rlink into try_process_rlink
bjorn3 Mar 28, 2021
c752ee5
Tiny cleanup
bjorn3 Mar 28, 2021
673c1b6
Remove unnecessary argument
bjorn3 Mar 28, 2021
808090e
Pass target_cpu to LinkerInfo::new instead of link_binary
bjorn3 Mar 28, 2021
c47eeac
Move wasm_import_module_map provider to cg_ssa
bjorn3 Mar 29, 2021
18d1b3f
Fix hotplug codegen backend test
bjorn3 Mar 30, 2021
0447f91
Let load_query_result_cache take a &DefPathTable
bjorn3 Mar 30, 2021
4a6cfc6
Don't arena allocate Definitions
bjorn3 May 2, 2021
b252924
Simplify make_input
bjorn3 May 2, 2021
b71cd56
Move queries.crate_name()
bjorn3 May 2, 2021
163b480
Run save_analysis even when analysis returned an error
bjorn3 May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions compiler/rustc_driver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,10 @@ fn run_compiler(
return early_exit();
}

if sess.opts.debugging_opts.save_analysis {
let crate_name = queries.crate_name()?.peek().clone();
queries.global_ctxt()?.peek_mut().enter(|tcx| {
let result = tcx.analysis(LOCAL_CRATE);

let crate_name = queries.crate_name()?.peek().clone();
queries.global_ctxt()?.peek_mut().enter(|tcx| {
let result = tcx.analysis(LOCAL_CRATE);
if sess.opts.debugging_opts.save_analysis {
sess.time("save_analysis", || {
save::process_crate(
tcx,
Expand All @@ -428,12 +427,9 @@ fn run_compiler(
),
)
});

result
})?;
}

queries.global_ctxt()?.peek_mut().enter(|tcx| tcx.analysis(LOCAL_CRATE))?;
}
result
})?;

if callbacks.after_analysis(compiler, queries) == Compilation::Stop {
return early_exit();
Expand Down