Skip to content

Commit abe9c14

Browse files
committed
Fix major diagnostic regression
Future work: maybe add a new method to the query context trait to see if we are unwinding for a purpose and not an ice?
1 parent b679d8a commit abe9c14

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

compiler/rustc_query_system/src/query/plumbing.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use rustc_data_structures::stack::ensure_sufficient_stack;
1919
use rustc_data_structures::sync::Lock;
2020
#[cfg(parallel_compiler)]
2121
use rustc_data_structures::{outline, sync};
22-
use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, StashKey};
22+
use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, FatalError, StashKey};
2323
use rustc_span::{Span, DUMMY_SP};
2424
use std::cell::Cell;
2525
use std::collections::hash_map::Entry;
@@ -370,9 +370,7 @@ where
370370
// so we just return the error.
371371
cycle_error(query, qcx, id, span)
372372
}
373-
QueryResult::Poisoned => {
374-
panic!("job for query '{}' failed to start and was poisoned", query.name())
375-
}
373+
QueryResult::Poisoned => FatalError.raise(),
376374
}
377375
}
378376
}

0 commit comments

Comments
 (0)