Skip to content

Commit

Permalink
Auto merge of #81892 - jyn514:no-inline, r=cjgillot
Browse files Browse the repository at this point in the history
[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`
  • Loading branch information
bors committed Feb 9, 2021
2 parents 185de5f + 4f77a1a commit 097bc6a
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions compiler/rustc_query_system/src/query/plumbing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pub struct QueryState<D, Q, C: QueryCache> {
}

impl<D, Q, C: QueryCache> QueryState<D, Q, C> {
#[inline]
pub(super) fn get_lookup<'tcx>(
&'tcx self,
key: &C::Key,
Expand Down Expand Up @@ -84,7 +83,6 @@ where
Q: Clone,
C: QueryCache,
{
#[inline(always)]
pub fn iter_results<R>(
&self,
f: impl for<'a> FnOnce(
Expand All @@ -94,7 +92,6 @@ where
self.cache.iter(&self.shards, |shard| &mut shard.cache, f)
}

#[inline(always)]
pub fn all_inactive(&self) -> bool {
let shards = self.shards.lock_shards();
shards.iter().all(|shard| shard.active.is_empty())
Expand Down Expand Up @@ -270,7 +267,6 @@ 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, 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) };
Expand All @@ -294,7 +290,6 @@ where
}
}

#[inline(always)]
fn with_diagnostics<F, R>(f: F) -> (R, ThinVec<Diagnostic>)
where
F: FnOnce(Option<&Lock<ThinVec<Diagnostic>>>) -> R,
Expand Down Expand Up @@ -362,7 +357,6 @@ where
/// 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
/// to compute it.
#[inline(always)]
fn try_get_cached<CTX, C, R, OnHit, OnMiss>(
tcx: CTX,
state: &QueryState<CTX::DepKind, CTX::Query, C>,
Expand Down Expand Up @@ -394,7 +388,6 @@ where
)
}

#[inline(always)]
fn try_execute_query<CTX, C>(
tcx: CTX,
state: &QueryState<CTX::DepKind, CTX::Query, C>,
Expand Down Expand Up @@ -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
where
Q: QueryDescription<CTX>,
Expand All @@ -739,7 +731,6 @@ where
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)
where
Q: QueryDescription<CTX>,
Expand All @@ -749,7 +740,6 @@ where
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>)
where
Q: QueryDescription<CTX>,
Expand Down

0 comments on commit 097bc6a

Please sign in to comment.