Skip to content

Factor query arena allocation out from query caches #107833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 17, 2023
Merged

Factor query arena allocation out from query caches #107833

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a51a205
Factor query arena allocation out from query caches
Zoxc Feb 8, 2023
265e1e9
Use dropless arena when possible
Zoxc Feb 13, 2023
067bf2a
Move provider fields back to rustc_query_impl
Zoxc Feb 14, 2023
1ae1eac
Add some comments and use inline(always) on query_provided_to_value
Zoxc Feb 14, 2023
caf29b2
Remove parallel compiler fix
Zoxc Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions compiler/rustc_query_system/src/query/plumbing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,6 @@ where
// Forget ourself so our destructor won't poison the query
mem::forget(self);

// Mark as complete before we remove the job from the active state
// so no other thread can re-execute this query.
cache.complete(key.clone(), result, dep_node_index);

let job = {
#[cfg(parallel_compiler)]
let mut lock = state.active.get_shard_by_value(&key).lock();
Expand All @@ -271,6 +267,7 @@ where
QueryResult::Poisoned => panic!(),
}
};
cache.complete(key, result, dep_node_index);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't this required any more?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean the extra block that I removed? Not sure when it became redundant.


job.signal_complete();
}
Expand Down