aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-03-06 22:29:57 +0000
committerGitHub <[email protected]>2020-03-06 22:29:57 +0000
commitd4cea98bc342b0aa2603106a155722dcbe5534e1 (patch)
tree87c4174af3562af1a18ecde0c6aae5ab39879139
parent44a3f430f2335332e7948b4bc3e60c513e6800dd (diff)
parent9ce30281f6e618b53bc5e8d54be1cd4a4eae8cee (diff)
Merge #3502
3502: Don't reuse the Chalk solver r=matklad a=flodiebold This slows down analysis-stats a bit (~5% in my measurement), but improves incremental checking a lot because we can reuse trait solve results. Co-authored-by: Florian Diebold <[email protected]>
-rw-r--r--crates/ra_hir/src/db.rs3
-rw-r--r--crates/ra_hir_ty/src/db.rs8
-rw-r--r--crates/ra_hir_ty/src/traits.rs112
-rw-r--r--crates/ra_ide_db/src/change.rs1
4 files changed, 29 insertions, 95 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index a77bf6de6..ee597cfd2 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -18,8 +18,7 @@ pub use hir_ty::db::{
18 FieldTypesQuery, GenericDefaultsQuery, GenericPredicatesForParamQuery, GenericPredicatesQuery, 18 FieldTypesQuery, GenericDefaultsQuery, GenericPredicatesForParamQuery, GenericPredicatesQuery,
19 HirDatabase, HirDatabaseStorage, ImplDatumQuery, ImplSelfTyQuery, ImplTraitQuery, 19 HirDatabase, HirDatabaseStorage, ImplDatumQuery, ImplSelfTyQuery, ImplTraitQuery,
20 ImplsForTraitQuery, ImplsInCrateQuery, InternAssocTyValueQuery, InternChalkImplQuery, 20 ImplsForTraitQuery, ImplsInCrateQuery, InternAssocTyValueQuery, InternChalkImplQuery,
21 InternTypeCtorQuery, StructDatumQuery, TraitDatumQuery, TraitSolveQuery, TraitSolverQuery, 21 InternTypeCtorQuery, StructDatumQuery, TraitDatumQuery, TraitSolveQuery, TyQuery, ValueTyQuery,
22 TyQuery, ValueTyQuery,
23}; 22};
24 23
25#[test] 24#[test]
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs
index f79faa84d..7db28a1f8 100644
--- a/crates/ra_hir_ty/src/db.rs
+++ b/crates/ra_hir_ty/src/db.rs
@@ -66,14 +66,6 @@ pub trait HirDatabase: DefDatabase {
66 #[salsa::invoke(crate::traits::impls_for_trait_query)] 66 #[salsa::invoke(crate::traits::impls_for_trait_query)]
67 fn impls_for_trait(&self, krate: CrateId, trait_: TraitId) -> Arc<[ImplId]>; 67 fn impls_for_trait(&self, krate: CrateId, trait_: TraitId) -> Arc<[ImplId]>;
68 68
69 /// This provides the Chalk trait solver instance. Because Chalk always
70 /// works from a specific crate, this query is keyed on the crate; and
71 /// because Chalk does its own internal caching, the solver is wrapped in a
72 /// Mutex and the query does an untracked read internally, to make sure the
73 /// cached state is thrown away when input facts change.
74 #[salsa::invoke(crate::traits::trait_solver_query)]
75 fn trait_solver(&self, krate: CrateId) -> crate::traits::TraitSolver;
76
77 // Interned IDs for Chalk integration 69 // Interned IDs for Chalk integration
78 #[salsa::interned] 70 #[salsa::interned]
79 fn intern_type_ctor(&self, type_ctor: TypeCtor) -> crate::TypeCtorId; 71 fn intern_type_ctor(&self, type_ctor: TypeCtor) -> crate::TypeCtorId;
diff --git a/crates/ra_hir_ty/src/traits.rs b/crates/ra_hir_ty/src/traits.rs
index bdf23ac02..8de588790 100644
--- a/crates/ra_hir_ty/src/traits.rs
+++ b/crates/ra_hir_ty/src/traits.rs
@@ -1,12 +1,9 @@
1//! Trait solving using Chalk. 1//! Trait solving using Chalk.
2use std::{ 2use std::{panic, sync::Arc};
3 panic,
4 sync::{Arc, Mutex},
5};
6 3
7use chalk_ir::cast::Cast; 4use chalk_ir::cast::Cast;
8use hir_def::{expr::ExprId, DefWithBodyId, ImplId, TraitId, TypeAliasId}; 5use hir_def::{expr::ExprId, DefWithBodyId, ImplId, TraitId, TypeAliasId};
9use ra_db::{impl_intern_key, salsa, Canceled, CrateId}; 6use ra_db::{impl_intern_key, salsa, CrateId};
10use ra_prof::profile; 7use ra_prof::profile;
11use rustc_hash::FxHashSet; 8use rustc_hash::FxHashSet;
12 9
@@ -19,74 +16,6 @@ use self::chalk::{from_chalk, Interner, ToChalk};
19pub(crate) mod chalk; 16pub(crate) mod chalk;
20mod builtin; 17mod builtin;
21 18
22#[derive(Debug, Clone)]
23pub struct TraitSolver {
24 krate: CrateId,
25 inner: Arc<Mutex<chalk_solve::Solver<Interner>>>,
26}
27
28/// We need eq for salsa
29impl PartialEq for TraitSolver {
30 fn eq(&self, other: &TraitSolver) -> bool {
31 Arc::ptr_eq(&self.inner, &other.inner)
32 }
33}
34
35impl Eq for TraitSolver {}
36
37impl TraitSolver {
38 fn solve(
39 &self,
40 db: &impl HirDatabase,
41 goal: &chalk_ir::UCanonical<chalk_ir::InEnvironment<chalk_ir::Goal<Interner>>>,
42 ) -> Option<chalk_solve::Solution<Interner>> {
43 let context = ChalkContext { db, krate: self.krate };
44 log::debug!("solve goal: {:?}", goal);
45 let mut solver = match self.inner.lock() {
46 Ok(it) => it,
47 // Our cancellation works via unwinding, but, as chalk is not
48 // panic-safe, we need to make sure to propagate the cancellation.
49 // Ideally, we should also make chalk panic-safe.
50 Err(_) => ra_db::Canceled::throw(),
51 };
52
53 let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL);
54
55 let solution = panic::catch_unwind({
56 let solver = panic::AssertUnwindSafe(&mut solver);
57 let context = panic::AssertUnwindSafe(&context);
58 move || {
59 solver.0.solve_limited(context.0, goal, || {
60 context.0.db.check_canceled();
61 let remaining = fuel.get();
62 fuel.set(remaining - 1);
63 if remaining == 0 {
64 log::debug!("fuel exhausted");
65 }
66 remaining > 0
67 })
68 }
69 });
70
71 let solution = match solution {
72 Ok(it) => it,
73 Err(err) => {
74 if err.downcast_ref::<Canceled>().is_some() {
75 panic::resume_unwind(err)
76 } else {
77 log::error!("chalk panicked :-(");
78 // Reset the solver, as it is not panic-safe.
79 *solver = create_chalk_solver();
80 None
81 }
82 }
83 };
84
85 log::debug!("solve({:?}) => {:?}", goal, solution);
86 solution
87 }
88}
89
90/// This controls the maximum size of types Chalk considers. If we set this too 19/// This controls the maximum size of types Chalk considers. If we set this too
91/// high, we can run into slow edge cases; if we set it too low, Chalk won't 20/// high, we can run into slow edge cases; if we set it too low, Chalk won't
92/// find some solutions. 21/// find some solutions.
@@ -100,16 +29,6 @@ struct ChalkContext<'a, DB> {
100 krate: CrateId, 29 krate: CrateId,
101} 30}
102 31
103pub(crate) fn trait_solver_query(
104 db: &(impl HirDatabase + salsa::Database),
105 krate: CrateId,
106) -> TraitSolver {
107 db.salsa_runtime().report_untracked_read();
108 // krate parameter is just so we cache a unique solver per crate
109 log::debug!("Creating new solver for crate {:?}", krate);
110 TraitSolver { krate, inner: Arc::new(Mutex::new(create_chalk_solver())) }
111}
112
113fn create_chalk_solver() -> chalk_solve::Solver<Interner> { 32fn create_chalk_solver() -> chalk_solve::Solver<Interner> {
114 let solver_choice = 33 let solver_choice =
115 chalk_solve::SolverChoice::SLG { max_size: CHALK_SOLVER_MAX_SIZE, expected_answers: None }; 34 chalk_solve::SolverChoice::SLG { max_size: CHALK_SOLVER_MAX_SIZE, expected_answers: None };
@@ -239,10 +158,35 @@ pub(crate) fn trait_solve_query(
239 // We currently don't deal with universes (I think / hope they're not yet 158 // We currently don't deal with universes (I think / hope they're not yet
240 // relevant for our use cases?) 159 // relevant for our use cases?)
241 let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 }; 160 let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 };
242 let solution = db.trait_solver(krate).solve(db, &u_canonical); 161 let solution = solve(db, krate, &u_canonical);
243 solution.map(|solution| solution_from_chalk(db, solution)) 162 solution.map(|solution| solution_from_chalk(db, solution))
244} 163}
245 164
165fn solve(
166 db: &impl HirDatabase,
167 krate: CrateId,
168 goal: &chalk_ir::UCanonical<chalk_ir::InEnvironment<chalk_ir::Goal<Interner>>>,
169) -> Option<chalk_solve::Solution<Interner>> {
170 let context = ChalkContext { db, krate };
171 log::debug!("solve goal: {:?}", goal);
172 let mut solver = create_chalk_solver();
173
174 let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL);
175
176 let solution = solver.solve_limited(&context, goal, || {
177 context.db.check_canceled();
178 let remaining = fuel.get();
179 fuel.set(remaining - 1);
180 if remaining == 0 {
181 log::debug!("fuel exhausted");
182 }
183 remaining > 0
184 });
185
186 log::debug!("solve({:?}) => {:?}", goal, solution);
187 solution
188}
189
246fn solution_from_chalk( 190fn solution_from_chalk(
247 db: &impl HirDatabase, 191 db: &impl HirDatabase,
248 solution: chalk_solve::Solution<Interner>, 192 solution: chalk_solve::Solution<Interner>,
diff --git a/crates/ra_ide_db/src/change.rs b/crates/ra_ide_db/src/change.rs
index 7e9310005..de5c6eb8f 100644
--- a/crates/ra_ide_db/src/change.rs
+++ b/crates/ra_ide_db/src/change.rs
@@ -362,7 +362,6 @@ impl RootDatabase {
362 hir::db::GenericDefaultsQuery 362 hir::db::GenericDefaultsQuery
363 hir::db::ImplsInCrateQuery 363 hir::db::ImplsInCrateQuery
364 hir::db::ImplsForTraitQuery 364 hir::db::ImplsForTraitQuery
365 hir::db::TraitSolverQuery
366 hir::db::InternTypeCtorQuery 365 hir::db::InternTypeCtorQuery
367 hir::db::InternChalkImplQuery 366 hir::db::InternChalkImplQuery
368 hir::db::InternAssocTyValueQuery 367 hir::db::InternAssocTyValueQuery