bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Streamline active_cache to done_cache transfer.

Browse source
This commit is contained in:
Nicholas Nethercote 2022-06-03 11:50:31 +10:00
parent fee3a459dd
commit cdb446fec3
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_data_structures/src/obligation_forest/mod.rs
View file

@ -634,17 +634,14 @@ impl<O: ForestObligation> ObligationForest<O> {
} }
} }
NodeState::Done => { NodeState::Done => {
// This lookup can fail because the contents of // The removal lookup might fail because the contents of
// `self.active_cache` are not guaranteed to match those of // `self.active_cache` are not guaranteed to match those of
// `self.nodes`. See the comment in `process_obligation` // `self.nodes`. See the comment in `process_obligation`
// for more details. // for more details.
if let Some((predicate, _)) = let cache_key = node.obligation.as_cache_key();
self.active_cache.remove_entry(&node.obligation.as_cache_key()) self.active_cache.remove(&cache_key);
{ self.done_cache.insert(cache_key);
self.done_cache.insert(predicate);
} else {
self.done_cache.insert(node.obligation.as_cache_key().clone());
}
// Extract the success stories. // Extract the success stories.
outcome_cb(&node.obligation); outcome_cb(&node.obligation);
node_rewrites[index] = orig_nodes_len; node_rewrites[index] = orig_nodes_len;