rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Drop the cache lock earlier.

Browse Source
This commit is contained in:
Camille GILLOT
2021-02-06 14:04:20 +01:00
parent 15b0bc6b83
commit 280a2866d5
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_query_system/src/query/caches.rs
View File

@@ -37,7 +37,7 @@ pub trait QueryCache: QueryStorage {
key: &Self::Key,
// `on_hit` can be called while holding a lock to the query state shard.
on_hit: OnHit,
) -> Result<R, QueryLookup<'s, Self::Sharded>>
) -> Result<R, QueryLookup>
where
OnHit: FnOnce(&Self::Stored, DepNodeIndex) -> R;
@@ -98,12 +98,12 @@ where
state: &'s QueryCacheStore<Self>,
key: &K,
on_hit: OnHit,
) -> Result<R, QueryLookup<'s, Self::Sharded>>
) -> Result<R, QueryLookup>
where
OnHit: FnOnce(&V, DepNodeIndex) -> R,
{
let lookup = state.get_lookup(key);
let result = lookup.lock.raw_entry().from_key_hashed_nocheck(lookup.key_hash, key);
let (lookup, lock) = state.get_lookup(key);
let result = lock.raw_entry().from_key_hashed_nocheck(lookup.key_hash, key);
if let Some((_, value)) = result {
let hit_result = on_hit(&value.0, value.1);
@@ -181,12 +181,12 @@ where
state: &'s QueryCacheStore<Self>,
key: &K,
on_hit: OnHit,
) -> Result<R, QueryLookup<'s, Self::Sharded>>
) -> Result<R, QueryLookup>
where
OnHit: FnOnce(&&'tcx V, DepNodeIndex) -> R,
{
let lookup = state.get_lookup(key);
let result = lookup.lock.raw_entry().from_key_hashed_nocheck(lookup.key_hash, key);
let (lookup, lock) = state.get_lookup(key);
let result = lock.raw_entry().from_key_hashed_nocheck(lookup.key_hash, key);
if let Some((_, value)) = result {
let hit_result = on_hit(&&value.0, value.1);