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

Auto merge of #81892 - jyn514:no-inline, r=cjgillot

Browse Source 
[experiment] remove `#[inline]` from rustc_query_system::plumbing

These functions have a ton of generic parameters and are instantiated
over and over again. Hopefully this will reduce binary bloat and speed
up bootstrapping times.

r? `@cjgillot`
This commit is contained in:
bors 2021-02-09 18:37:33 +00:00
commit 097bc6a84f
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_query_system/src/query/plumbing.rs
View File

@ -50,7 +50,6 @@ pub struct QueryState<D, Q, C: QueryCache> {
} }
impl<D, Q, C: QueryCache> QueryState<D, Q, C> { impl<D, Q, C: QueryCache> QueryState<D, Q, C> {
#[inline]
pub(super) fn get_lookup<'tcx>( pub(super) fn get_lookup<'tcx>(
&'tcx self, &'tcx self,
key: &C::Key, key: &C::Key,
@ -84,7 +83,6 @@ impl<D, Q, C> QueryState<D, Q, C>
Q: Clone, Q: Clone,
C: QueryCache, C: QueryCache,
{ {
#[inline(always)]
pub fn iter_results<R>( pub fn iter_results<R>(
&self, &self,
f: impl for<'a> FnOnce( f: impl for<'a> FnOnce(
@ -94,7 +92,6 @@ pub fn iter_results<R>(
self.cache.iter(&self.shards, |shard| &mut shard.cache, f) self.cache.iter(&self.shards, |shard| &mut shard.cache, f)
} }
#[inline(always)]
pub fn all_inactive(&self) -> bool { pub fn all_inactive(&self) -> bool {
let shards = self.shards.lock_shards(); let shards = self.shards.lock_shards();
shards.iter().all(|shard| shard.active.is_empty()) shards.iter().all(|shard| shard.active.is_empty())
@ -270,7 +267,6 @@ fn try_start<'a, 'b, CTX>(
/// Completes the query by updating the query cache with the `result`, /// 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 /// signals the waiter and forgets the JobOwner, so it won't poison the query
#[inline(always)]
fn complete(self, 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 // We can move out of `self` here because we `mem::forget` it below
let key = unsafe { ptr::read(&self.key) }; let key = unsafe { ptr::read(&self.key) };
@ -294,7 +290,6 @@ fn complete(self, result: C::Value, dep_node_index: DepNodeIndex) -> C::Stored {
} }
} }
#[inline(always)]
fn with_diagnostics<F, R>(f: F) -> (R, ThinVec<Diagnostic>) fn with_diagnostics<F, R>(f: F) -> (R, ThinVec<Diagnostic>)
where where
F: FnOnce(Option<&Lock<ThinVec<Diagnostic>>>) -> R, F: FnOnce(Option<&Lock<ThinVec<Diagnostic>>>) -> R,
@ -362,7 +357,6 @@ enum TryGetJob<'tcx, D, Q, C>
/// It returns the shard index and a lock guard to the shard, /// It returns the shard index and a lock guard to the shard,
/// which will be used if the query is not in the cache and we need /// which will be used if the query is not in the cache and we need
/// to compute it. /// to compute it.
#[inline(always)]
fn try_get_cached<CTX, C, R, OnHit, OnMiss>( fn try_get_cached<CTX, C, R, OnHit, OnMiss>(
tcx: CTX, tcx: CTX,
state: &QueryState<CTX::DepKind, CTX::Query, C>, state: &QueryState<CTX::DepKind, CTX::Query, C>,
@ -394,7 +388,6 @@ fn try_get_cached<CTX, C, R, OnHit, OnMiss>(
) )
} }
#[inline(always)]
fn try_execute_query<CTX, C>( fn try_execute_query<CTX, C>(
tcx: CTX, tcx: CTX,
state: &QueryState<CTX::DepKind, CTX::Query, C>, state: &QueryState<CTX::DepKind, CTX::Query, C>,
@ -727,7 +720,6 @@ fn force_query_impl<CTX, C>(
); );
} }
#[inline(always)]
pub fn get_query<Q, CTX>(tcx: CTX, span: Span, key: Q::Key) -> Q::Stored pub fn get_query<Q, CTX>(tcx: CTX, span: Span, key: Q::Key) -> Q::Stored
where where
Q: QueryDescription<CTX>, Q: QueryDescription<CTX>,
@ -739,7 +731,6 @@ pub fn get_query<Q, CTX>(tcx: CTX, span: Span, key: Q::Key) -> Q::Stored
get_query_impl(tcx, Q::query_state(tcx), span, key, &Q::VTABLE) get_query_impl(tcx, Q::query_state(tcx), span, key, &Q::VTABLE)
} }
#[inline(always)]
pub fn ensure_query<Q, CTX>(tcx: CTX, key: Q::Key) pub fn ensure_query<Q, CTX>(tcx: CTX, key: Q::Key)
where where
Q: QueryDescription<CTX>, Q: QueryDescription<CTX>,
@ -749,7 +740,6 @@ pub fn ensure_query<Q, CTX>(tcx: CTX, key: Q::Key)
ensure_query_impl(tcx, Q::query_state(tcx), key, &Q::VTABLE) ensure_query_impl(tcx, Q::query_state(tcx), key, &Q::VTABLE)
} }
#[inline(always)]
pub fn force_query<Q, CTX>(tcx: CTX, key: Q::Key, span: Span, dep_node: DepNode<CTX::DepKind>) pub fn force_query<Q, CTX>(tcx: CTX, key: Q::Key, span: Span, dep_node: DepNode<CTX::DepKind>)
where where
Q: QueryDescription<CTX>, Q: QueryDescription<CTX>,