about summary refs log tree commit diff
path: root/compiler
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-03-29 06:02:42 +0200
committerGitHub <noreply@github.com>2023-03-29 06:02:42 +0200
commit09c139846b5456cf5c09af9ddd3013ab7171334c (patch)
treec158a7a2048ed69237a78746cedc5db75ce46cc9 /compiler
parent6be27b19a6ccd7ade90e41895a6fe20a2490e9b0 (diff)
parentbe6a09f96bbe0c0c6ce909a84ea0164112edfced (diff)
downloadrust-09c139846b5456cf5c09af9ddd3013ab7171334c.tar.gz
rust-09c139846b5456cf5c09af9ddd3013ab7171334c.zip
Rollup merge of #109694 - BelovDV:fix-panic-jobserver-token, r=bjorn3
do not panic on failure to acquire jobserver token

Purpose: remove `panic`.

Rust fails to acquire token if an error in build system occurs - environment variable contains incorrect `jobserver-auth`. It isn't ice so compiler shouldn't panic on such error.

Related issue: #46981
Diffstat (limited to 'compiler')
-rw-r--r--compiler/rustc_codegen_ssa/src/back/write.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs
index 7ce72d21727..2dda4cd1694 100644
--- a/compiler/rustc_codegen_ssa/src/back/write.rs
+++ b/compiler/rustc_codegen_ssa/src/back/write.rs
@@ -1452,8 +1452,8 @@ fn start_executing_work<B: ExtraBackendMethods>(
                         Err(e) => {
                             let msg = &format!("failed to acquire jobserver token: {}", e);
                             shared_emitter.fatal(msg);
-                            // Exit the coordinator thread
-                            panic!("{}", msg)
+                            codegen_done = true;
+                            codegen_aborted = true;
                         }
                     }
                 }