@@ -1638,9 +1638,9 @@ fn start_executing_work(tcx: TyCtxt,
1638
1638
needs_lto. push ( result) ;
1639
1639
}
1640
1640
Message :: Done { result : Err ( ( ) ) , worker_id : _ } => {
1641
- shared_emitter. fatal ( "aborting due to worker thread panic " ) ;
1641
+ shared_emitter. fatal ( "aborting due to worker thread failure " ) ;
1642
1642
// Exit the coordinator thread
1643
- panic ! ( "aborting due to worker thread panic " )
1643
+ panic ! ( "aborting due to worker thread failure " )
1644
1644
}
1645
1645
Message :: TranslateItem => {
1646
1646
bug ! ( "the coordinator should not receive translation requests" )
@@ -1741,23 +1741,16 @@ fn spawn_work(cgcx: CodegenContext, work: WorkItem) {
1741
1741
// Execute the work itself, and if it finishes successfully then flag
1742
1742
// ourselves as a success as well.
1743
1743
//
1744
- // Note that we ignore the result coming out of `execute_work_item`
1745
- // which will tell us if the worker failed with a `FatalError`. If that
1746
- // has happened, however, then a diagnostic was sent off to the main
1747
- // thread, along with an `AbortIfErrors` message. In that case the main
1748
- // thread is already exiting anyway most likely.
1749
- //
1750
- // In any case, there's no need for us to take further action here, so
1751
- // we just ignore the result and then send off our message saying that
1752
- // we're done, which if `execute_work_item` failed is unlikely to be
1753
- // seen by the main thread, but hey we might as well try anyway.
1744
+ // Note that we ignore any `FatalError` coming out of `execute_work_item`,
1745
+ // as a diagnostic was already sent off to the main thread - just
1746
+ // surface that there was an error in this worker.
1754
1747
bomb. result = {
1755
1748
let _timing_guard = cgcx. time_graph . as_ref ( ) . map ( |tg| {
1756
1749
tg. start ( time_graph:: TimelineId ( cgcx. worker ) ,
1757
1750
LLVM_WORK_PACKAGE_KIND ,
1758
1751
& work. name ( ) )
1759
1752
} ) ;
1760
- Some ( execute_work_item ( & cgcx, work) . unwrap ( ) )
1753
+ execute_work_item ( & cgcx, work) . ok ( )
1761
1754
} ;
1762
1755
} ) ;
1763
1756
}
0 commit comments