diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-12-08 06:44:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 06:44:43 +0100 |
| commit | beabb5e2e30759a6613d0fb7eed5c79e70f71476 (patch) | |
| tree | 2f963815f910cd5522cb19eb855858ccd6492eed /compiler/rustc_interface/src/interface.rs | |
| parent | f7c892e3234829ff0f6e5b52ad1daf0c0be412a4 (diff) | |
| parent | dabedb711f13e14401e6be2f9a58a9bc1974a488 (diff) | |
Rollup merge of #118709 - oksbsb:fix-job-server, r=SparrowLii
fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use override #118589, resolve merge conflict `@petrochenkov` `@SparrowLii` Thanks!
Diffstat (limited to 'compiler/rustc_interface/src/interface.rs')
| -rw-r--r-- | compiler/rustc_interface/src/interface.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_interface/src/interface.rs b/compiler/rustc_interface/src/interface.rs index 7831b251db4..6527e87d396 100644 --- a/compiler/rustc_interface/src/interface.rs +++ b/compiler/rustc_interface/src/interface.rs @@ -316,6 +316,10 @@ pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Se // Set parallel mode before thread pool creation, which will create `Lock`s. rustc_data_structures::sync::set_dyn_thread_safe_mode(config.opts.unstable_opts.threads > 1); + // Check jobserver before run_in_thread_pool_with_globals, which call jobserver::acquire_thread + let early_handler = EarlyErrorHandler::new(config.opts.error_format); + early_handler.initialize_checked_jobserver(); + util::run_in_thread_pool_with_globals( config.opts.edition, config.opts.unstable_opts.threads, |