nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly reset chalk state after a panic

Browse Source
This commit is contained in:
Aleksey Kladov 2019-09-28 18:49:00 +03:00
parent 21fa889cf3
commit e60677178e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/ra_hir/src/ty/traits.rs
View File

@ -1,9 +1,8 @@
//! Trait solving using Chalk.
use std::sync::Arc;
use std::sync::{Arc, Mutex};
use chalk_ir::cast::Cast;
use log::debug;
use parking_lot::Mutex;
use ra_db::salsa;
use ra_prof::profile;
use rustc_hash::FxHashSet;
@ -30,9 +29,6 @@ impl PartialEq for TraitSolver {
impl Eq for TraitSolver {}
// FIXME: this impl is WRONG, chalk is not RefUnwindSafe, and this causes #1927
impl std::panic::RefUnwindSafe for TraitSolver {}
impl TraitSolver {
fn solve(
&self,
@ -41,7 +37,14 @@ impl TraitSolver {
) -> Option<chalk_solve::Solution> {
let context = ChalkContext { db, krate: self.krate };
debug!("solve goal: {:?}", goal);
let solution = self.inner.lock().solve(&context, goal);
let mut solver = match self.inner.lock() {
Ok(it) => it,
// Our cancellation works via unwinding, but, as chalk is not
// panic-safe, we need to make sure to propagate the cancellation.
// Ideally, we should also make chalk panic-safe.
Err(_) => ra_db::Canceled::throw(),
};
let solution = solver.solve(&context, goal);
debug!("solve({:?}) => {:?}", goal, solution);
solution
}