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

Only use logging db if CHALK_DEBUG is active

Browse Source
This commit is contained in:
Wilco Kusee 2020-07-26 12:27:25 +02:00
parent 58e338a729
commit 10c33275b0
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/hir_ty/src/traits.rs
View File

@ -152,9 +152,6 @@ fn solve(
goal: &chalk_ir::UCanonical<chalk_ir::InEnvironment<chalk_ir::Goal<Interner>>>,
) -> Option<chalk_solve::Solution<Interner>> {
let context = ChalkContext { db, krate };
let logging_db = LoggingRustIrDatabase::new(context);
log::debug!("solve goal: {:?}", goal);
let mut solver = create_chalk_solver();
@ -169,17 +166,23 @@ fn solve(
}
remaining > 0
};
let mut solve = || {
let solution = solver.solve_limited(&logging_db, goal, should_continue);
log::debug!("solve({:?}) => {:?}", goal, solution);
solution
};
// don't set the TLS for Chalk unless Chalk debugging is active, to make
// extra sure we only use it for debugging
let solution =
if is_chalk_debug() { chalk::tls::set_current_program(db, solve) } else { solve() };
log::debug!("chalk program:\n{}", logging_db);
let solution = if is_chalk_debug() {
let logging_db = LoggingRustIrDatabase::new(context);
let solve = || {
let solution = solver.solve_limited(&logging_db, goal, should_continue);
log::debug!("chalk program:\n{}", logging_db);
solution
};
// don't set the TLS for Chalk unless Chalk debugging is active, to make
// extra sure we only use it for debugging
chalk::tls::set_current_program(db, solve)
} else {
solver.solve_limited(&context, goal, should_continue)
};
log::debug!("solve({:?}) => {:?}", goal, solution);
solution
}