Skip to content

Commit 93ff544

Browse files
Cache evaluations even when proof tree is being built
1 parent c625162 commit 93ff544

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

compiler/rustc_type_ir/src/search_graph/global_cache.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ impl<X: Cx> GlobalCache<X> {
5757
let with_overflow = WithOverflow { nested_goals, result };
5858
let prev = entry.with_overflow.insert(required_depth, with_overflow);
5959
if let Some(prev) = &prev {
60-
assert!(cx.evaluation_is_concurrent());
61-
assert_eq!(cx.get_tracked(&prev.result), origin_result);
60+
let prev_result = cx.get_tracked(&prev.result);
61+
assert_eq!(prev_result, origin_result);
6262
}
6363
} else {
6464
let prev = entry.success.replace(Success { required_depth, nested_goals, result });
6565
if let Some(prev) = &prev {
66-
assert!(cx.evaluation_is_concurrent());
67-
assert_eq!(cx.get_tracked(&prev.result), origin_result);
66+
let prev_result = cx.get_tracked(&prev.result);
67+
assert_eq!(prev_result, origin_result);
6868
}
6969
}
7070
}

compiler/rustc_type_ir/src/search_graph/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
652652
// Do not try to move a goal into the cache again if we're testing
653653
// the global cache.
654654
assert_eq!(result, expected, "input={input:?}");
655-
} else if D::inspect_is_noop(inspect) {
655+
} else {
656656
self.insert_global_cache(cx, final_entry, result, dep_node)
657657
}
658658
} else if D::ENABLE_PROVISIONAL_CACHE {

0 commit comments

Comments
 (0)