Move jobserver initialization before thread pool creation

Author: Mark-Simulacrum

Cargo.lock

@@ -4066,7 +4066,6 @@ dependencies = [
  "rustc_feature",
  "rustc_fs_util",
  "rustc_index",
- "rustc_jobserver",
  "rustc_span",
  "rustc_target",
  "serialize",

src/librustc_interface/interface.rs

@@ -206,6 +206,22 @@ pub fn run_compiler_in_existing_thread_pool<R>(
 
 pub fn run_compiler<R: Send>(mut config: Config, f: impl FnOnce(&Compiler) -> R + Send) -> R {
     let stderr = config.stderr.take();
+
+    if config.opts.debugging_opts.jobserver_token_requests {
+        if let config::ErrorOutputType::Json { .. } = config.opts.error_format {
+            if stderr.is_some() {
+                panic!("Non-default output not supported with -Zjobserver-token-requests");
+            }
+        } else {
+            panic!(
+                "-Zjobserver-token-requests can only be specified if using \
+                JSON error output type"
+            );
+        }
+    }
+
+    rustc_jobserver::initialize(config.opts.debugging_opts.jobserver_token_requests);
+
     util::spawn_thread_pool(
         config.opts.edition,
         config.opts.debugging_opts.threads,
@@ -215,6 +231,9 @@ pub fn run_compiler<R: Send>(mut config: Config, f: impl FnOnce(&Compiler) -> R
 }
 
 pub fn default_thread_pool<R: Send>(edition: edition::Edition, f: impl FnOnce() -> R + Send) -> R {
+    // FIXME: allow for smart jobserver
+    rustc_jobserver::initialize(false);
+
     // the 1 here is duplicating code in config.opts.debugging_opts.threads
     // which also defaults to 1; it ultimately doesn't matter as the default
     // isn't threaded, and just ignores this parameter

src/librustc_session/Cargo.toml

@@ -20,4 +20,3 @@ rustc_index = { path = "../librustc_index" }
 rustc_fs_util = { path = "../librustc_fs_util" }
 num_cpus = "1.0"
 syntax = { path = "../libsyntax" }
-rustc_jobserver = { path = "../librustc_jobserver" }

src/librustc_session/session.rs

@@ -30,7 +30,6 @@ use rustc_span::{MultiSpan, Span};
 
 use rustc_data_structures::flock;
 use rustc_data_structures::profiling::{SelfProfiler, SelfProfilerRef};
-use rustc_jobserver::{self as jobserver, Client};
 use rustc_target::spec::{PanicStrategy, RelroLevel, Target, TargetTriple};
 
 use std::cell::{self, RefCell};
@@ -1032,24 +1031,6 @@ fn build_session_(
         sopts.debugging_opts.time_passes,
     );
 
-    if sopts.debugging_opts.jobserver_token_requests {
-        if let config::ErrorOutputType::Json { .. } = sopts.error_format {
-            if is_diagnostic_output_raw {
-                panic!("Raw output format not supported with -Zjobserver-token-requests");
-            }
-        } else {
-            parse_sess
-                .span_diagnostic
-                .fatal(
-                    "-Zjobserver-token-requests can only be specified if \
-                        using JSON error output type",
-                )
-                .raise();
-        }
-    }
-
-    rustc_jobserver::initialize(sopts.debugging_opts.jobserver_token_requests);
-
     let sess = Session {
         target: target_cfg,
         host,