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

Calculate self-profile strings in Compiler::enter instead in codegen

Browse Source 
This avoids each tool having to separately find and call
`self_profile_alloc_strings`.

- Don't compute the global context if it hasn't yet been computed

  This avoids giving extraneous errors about unresolved names if an error
  occurs during parsing.
This commit is contained in:
Joshua Nelson
2021-01-22 13:46:52 -05:00
parent 1d1010f1af
commit ca72f9ed70
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustdoc/lib.rs
View File

@@ -539,7 +539,7 @@ fn main_options(options: config::Options) -> MainResult {
sess.fatal("Compilation failed, aborting rustdoc");
}
let mut global_ctxt = abort_on_err(queries.global_ctxt(), sess).take();
let mut global_ctxt = abort_on_err(queries.global_ctxt(), sess).peek_mut();
global_ctxt.enter(|tcx| {
let (mut krate, render_info, render_opts) = sess.time("run_global_ctxt", || {
@@ -568,7 +568,7 @@ fn main_options(options: config::Options) -> MainResult {
info!("going to format");
let (error_format, edition, debugging_options) = diag_opts;
let diag = core::new_handler(error_format, None, &debugging_options);
let main_result = match output_format {
match output_format {
None | Some(config::OutputFormat::Html) => sess.time("render_html", || {
run_renderer::<html::render::Context<'_>>(
krate,
@@ -589,10 +589,7 @@ fn main_options(options: config::Options) -> MainResult {
tcx,
)
}),
};
// NOTE: this is normally called in codegen, but rustdoc never goes to codegen.
tcx.alloc_self_profile_query_strings();
main_result
}
})
})
})