mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also wait on other threads if a WorkerFatalError occurs

Browse Source 
This means that codegen_aborted may be set when new codegen
requests arrive, so drop some related assertions. The new work
will simply be ignored.
This commit is contained in:
Nikita Popov 2022-07-27 13:07:48 +02:00
parent b00d0fa0c9
commit c87e20bab0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_codegen_ssa/src/back/write.rs
View File

@ -1475,14 +1475,12 @@ fn start_executing_work<B: ExtraBackendMethods>(
if !cgcx.opts.unstable_opts.no_parallel_llvm { if !cgcx.opts.unstable_opts.no_parallel_llvm {
helper.request_token(); helper.request_token();
} }
assert!(!codegen_aborted);
assert_eq!(main_thread_worker_state, MainThreadWorkerState::Codegenning); assert_eq!(main_thread_worker_state, MainThreadWorkerState::Codegenning);
main_thread_worker_state = MainThreadWorkerState::Idle; main_thread_worker_state = MainThreadWorkerState::Idle;
} }
Message::CodegenComplete => { Message::CodegenComplete => {
codegen_done = true; codegen_done = true;
assert!(!codegen_aborted);
assert_eq!(main_thread_worker_state, MainThreadWorkerState::Codegenning); assert_eq!(main_thread_worker_state, MainThreadWorkerState::Codegenning);
main_thread_worker_state = MainThreadWorkerState::Idle; main_thread_worker_state = MainThreadWorkerState::Idle;
} }
@ -1494,7 +1492,6 @@ fn start_executing_work<B: ExtraBackendMethods>(
// then conditions above will ensure no more work is spawned but // then conditions above will ensure no more work is spawned but
// we'll keep executing this loop until `running` hits 0. // we'll keep executing this loop until `running` hits 0.
Message::CodegenAborted => { Message::CodegenAborted => {
assert!(!codegen_aborted);
codegen_done = true; codegen_done = true;
codegen_aborted = true; codegen_aborted = true;
} }
@ -1536,8 +1533,11 @@ fn start_executing_work<B: ExtraBackendMethods>(
Message::Done { result: Err(None), worker_id: _ } => { Message::Done { result: Err(None), worker_id: _ } => {
bug!("worker thread panicked"); bug!("worker thread panicked");
} }
Message::Done { result: Err(Some(WorkerFatalError)), worker_id: _ } => { Message::Done { result: Err(Some(WorkerFatalError)), worker_id } => {
return Err(()); // Similar to CodegenAborted, wait for remaining work to finish.
free_worker(worker_id);
codegen_done = true;
codegen_aborted = true;
} }
Message::CodegenItem => bug!("the coordinator should not receive codegen requests"), Message::CodegenItem => bug!("the coordinator should not receive codegen requests"),
} }