bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #108359 - Zoxc:side-effects-tweak, r=cjgillot

Browse source 
Avoid code generation for ThinVec<Diagnostic>'s destructor in the query system

This avoids 2 instances of the destructor of `ThinVec<Diagnostic>` from being included in `execute_job`. It also outlines the cold branch in `store_side_effects` / `store_side_effects_for_anon_node`.
This commit is contained in:
bors 2024-01-20 15:20:15 +00:00
commit 159bdc1e93
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_query_system/src/dep_graph/graph.rs
View file

@ -891,7 +891,7 @@ impl<D: Deps> DepGraphData<D> {
insertion for {dep_node:?}"
);
if !side_effects.is_empty() {
if side_effects.maybe_any() {
qcx.dep_context().dep_graph().with_query_deserialization(|| {
self.emit_side_effects(qcx, dep_node_index, side_effects)
});

7
compiler/rustc_query_system/src/query/mod.rs
View file

@ -93,10 +93,13 @@ pub struct QuerySideEffects {
}
impl QuerySideEffects {
/// Returns true if there might be side effects.
#[inline]
pub fn is_empty(&self) -> bool {
pub fn maybe_any(&self) -> bool {
let QuerySideEffects { diagnostics } = self;
diagnostics.is_empty()
// Use `has_capacity` so that the destructor for `self.diagnostics` can be skipped
// if `maybe_any` is known to be false.
diagnostics.has_capacity()
}
pub fn append(&mut self, other: QuerySideEffects) {
let QuerySideEffects { diagnostics } = self;

5
compiler/rustc_query_system/src/query/plumbing.rs
View file

@ -538,10 +538,9 @@ where
prof_timer.finish_with_query_invocation_id(dep_node_index.into());
let diagnostics = diagnostics.into_inner();
let side_effects = QuerySideEffects { diagnostics };
let side_effects = QuerySideEffects { diagnostics: diagnostics.into_inner() };
if std::intrinsics::unlikely(!side_effects.is_empty()) {
if std::intrinsics::unlikely(side_effects.maybe_any()) {
if query.anon() {
qcx.store_side_effects_for_anon_node(dep_node_index, side_effects);
} else {