nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 02:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #75462 - Mark-Simulacrum:clean-queries, r=petrochenkov

Browse Source 
Remove unused tcx parameter

We shouldn't need access to a query context when storing already computed values.
This commit is contained in:
Tyler Mandry 2020-08-13 18:00:15 -07:00 committed by GitHub
commit 84f7991bf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc_query_system/query/caches.rs
View File

@ -43,9 +43,8 @@ pub trait QueryCache: QueryStorage {
OnHit: FnOnce(&Self::Stored, DepNodeIndex) -> R,
OnMiss: FnOnce(Self::Key, QueryLookup<'_, CTX, Self::Key, Self::Sharded>) -> R;
fn complete<CTX: QueryContext>(
fn complete(
&self,
tcx: CTX,
lock_sharded_storage: &mut Self::Sharded,
key: Self::Key,
value: Self::Value,
@ -112,9 +111,8 @@ impl<K: Eq + Hash, V: Clone> QueryCache for DefaultCache<K, V> {
}
#[inline]
fn complete<CTX: QueryContext>(
fn complete(
&self,
_: CTX,
lock_sharded_storage: &mut Self::Sharded,
key: K,
value: V,
@ -195,9 +193,8 @@ impl<'tcx, K: Eq + Hash, V: 'tcx> QueryCache for ArenaCache<'tcx, K, V> {
}
#[inline]
fn complete<CTX: QueryContext>(
fn complete(
&self,
_: CTX,
lock_sharded_storage: &mut Self::Sharded,
key: K,
value: V,

10
src/librustc_query_system/query/plumbing.rs
View File

@ -264,7 +264,7 @@ where
/// Completes the query by updating the query cache with the `result`,
/// signals the waiter and forgets the JobOwner, so it won't poison the query
#[inline(always)]
fn complete(self, tcx: CTX, result: C::Value, dep_node_index: DepNodeIndex) -> C::Stored {
fn complete(self, result: C::Value, dep_node_index: DepNodeIndex) -> C::Stored {
// We can move out of `self` here because we `mem::forget` it below
let key = unsafe { ptr::read(&self.key) };
let state = self.state;
@ -278,7 +278,7 @@ where
QueryResult::Started(job) => job,
QueryResult::Poisoned => panic!(),
};
let result = state.cache.complete(tcx, &mut lock.cache, key, result, dep_node_index);
let result = state.cache.complete(&mut lock.cache, key, result, dep_node_index);
(job, result)
};
@ -432,7 +432,7 @@ where
tcx.store_diagnostics_for_anon_node(dep_node_index, diagnostics);
}
return job.complete(tcx, result, dep_node_index);
return job.complete(result, dep_node_index);
}
let dep_node = query.to_dep_node(tcx, &key);
@ -458,7 +458,7 @@ where
})
});
if let Some((result, dep_node_index)) = loaded {
return job.complete(tcx, result, dep_node_index);
return job.complete(result, dep_node_index);
}
}
@ -609,7 +609,7 @@ where
}
}
let result = job.complete(tcx, result, dep_node_index);
let result = job.complete(result, dep_node_index);
(result, dep_node_index)
}