Handle GlobalCtxt directly from librustc_interface query system #66791
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -283,120 +283,127 @@ pub fn run_compiler( | |
| return sess.compile_status(); | ||
| } | ||
|
|
||
| let linker = compiler.enter(|queries| { | ||
| let early_exit = || sess.compile_status().map(|_| None); | ||
| queries.parse()?; | ||
|
|
||
| if let Some(ppm) = &sess.opts.pretty { | ||
| if ppm.needs_ast_map() { | ||
| queries.global_ctxt()?.peek_mut().enter(|tcx| { | ||
| let expanded_crate = queries.expansion()?.take().0; | ||
| pretty::print_after_hir_lowering( | ||
| tcx, | ||
| compiler.input(), | ||
| &expanded_crate, | ||
| *ppm, | ||
| compiler.output_file().as_ref().map(|p| &**p), | ||
| ); | ||
| Ok(()) | ||
| })?; | ||
| } else { | ||
| let krate = queries.parse()?.take(); | ||
| pretty::print_after_parsing( | ||
| sess, | ||
| &compiler.input(), | ||
| &krate, | ||
| *ppm, | ||
| compiler.output_file().as_ref().map(|p| &**p), | ||
| ); | ||
| } | ||
| return early_exit(); | ||
| } | ||
|
|
||
| if callbacks.after_parsing(compiler) == Compilation::Stop { | ||
| return early_exit(); | ||
| } | ||
|
|
||
| if sess.opts.debugging_opts.parse_only || | ||
| sess.opts.debugging_opts.show_span.is_some() || | ||
| sess.opts.debugging_opts.ast_json_noexpand { | ||
| return early_exit(); | ||
| } | ||
|
|
||
| { | ||
| let (_, lint_store) = &*queries.register_plugins()?.peek(); | ||
|
|
||
| // Lint plugins are registered; now we can process command line flags. | ||
| if sess.opts.describe_lints { | ||
| describe_lints(&sess, &lint_store, true); | ||
| return early_exit(); | ||
| } | ||
| } | ||
|
|
||
| queries.expansion()?; | ||
| if callbacks.after_expansion(compiler) == Compilation::Stop { | ||
| return early_exit(); | ||
| } | ||
|
|
||
| queries.prepare_outputs()?; | ||
|
|
||
| if sess.opts.output_types.contains_key(&OutputType::DepInfo) | ||
| && sess.opts.output_types.len() == 1 | ||
| { | ||
| return early_exit(); | ||
| } | ||
|
|
||
| queries.global_ctxt()?; | ||
|
|
||
| if sess.opts.debugging_opts.no_analysis || | ||
| sess.opts.debugging_opts.ast_json { | ||
| return early_exit(); | ||
| } | ||
|
|
||
| if sess.opts.debugging_opts.save_analysis { | ||
| let expanded_crate = &queries.expansion()?.peek().0; | ||
| let crate_name = queries.crate_name()?.peek().clone(); | ||
| queries.global_ctxt()?.peek_mut().enter(|tcx| { | ||
| let result = tcx.analysis(LOCAL_CRATE); | ||
|
|
||
| time(sess, "save analysis", || { | ||
| save::process_crate( | ||
| tcx, | ||
| &expanded_crate, | ||
| &crate_name, | ||
| &compiler.input(), | ||
| None, | ||
| DumpHandler::new( | ||
| compiler.output_dir().as_ref().map(|p| &**p), &crate_name | ||
| ) | ||
| ) | ||
| }); | ||
|
|
||
| result | ||
| // AST will be dropped *after* the `after_analysis` callback | ||
| // (needed by the RLS) | ||
| })?; | ||
| } else { | ||
| // Drop AST after creating GlobalCtxt to free memory | ||
| mem::drop(queries.expansion()?.take()); | ||
| } | ||
|
|
||
| queries.global_ctxt()?.peek_mut().enter(|tcx| tcx.analysis(LOCAL_CRATE))?; | ||
|
|
||
| if callbacks.after_analysis(compiler) == Compilation::Stop { | ||
| return early_exit(); | ||
| } | ||
|
Comment on lines
+386
to
+388
There was a problem hiding this comment. Is it maybe a problem that now, There was a problem hiding this comment. That is indeed the problem. The There was a problem hiding this comment. There should probably be an assertion to avoid calling There was a problem hiding this comment. I prepared a PR at #66896 (and tested that this indeed is sufficient to fix Miri).
I didn't do that as I wouldn't know how. There was a problem hiding this comment. Sorry for the delay. Do you still need me to do something? |
||
|
|
||
| if sess.opts.debugging_opts.save_analysis { | ||
| mem::drop(queries.expansion()?.take()); | ||
| } | ||
|
|
||
| queries.ongoing_codegen()?; | ||
|
|
||
| if sess.opts.debugging_opts.print_type_sizes { | ||
| sess.code_stats.print_type_sizes(); | ||
| } | ||
|
|
||
| let linker = queries.linker()?; | ||
| Ok(Some(linker)) | ||
| })?; | ||
|
|
||
| if let Some(linker) = linker { | ||
| linker.link()? | ||
| } | ||
|
|
||
| if sess.opts.debugging_opts.perf_stats { | ||
| sess.print_perf_stats(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.