Skip to content

Inline ActiveGuardDrop::drop_and_maybe_poison. #153747

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

Closed
nnethercote wants to merge 1 commit into from
Closed

Inline ActiveGuardDrop::drop_and_maybe_poison. #153747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions compiler/rustc_query_impl/src/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ where
let mut this = ManuallyDrop::new(self);

// Drop everything without poisoning the query.
this.drop_and_maybe_poison(/* poison */ false);
this.drop_and_maybe_poison::<false>();
}

fn drop_and_maybe_poison(&mut self, poison: bool) {
fn drop_and_maybe_poison<const POISON: bool>(&mut self) {
let status = {
let mut shard = self.state.active.lock_shard_by_hash(self.key_hash);
match shard.find_entry(self.key_hash, equivalent_key(self.key)) {
Expand All @@ -179,7 +179,7 @@ where
}
Ok(occupied) => {
let ((key, status), vacant) = occupied.remove();
if poison {
if POISON {
vacant.insert((key, ActiveKeyStatus::Poisoned));
}
status
Expand All @@ -203,7 +203,7 @@ where
#[cold]
fn drop(&mut self) {
// Poison the query so jobs waiting on it panic.
self.drop_and_maybe_poison(/* poison */ true);
self.drop_and_maybe_poison::<true>();
}
}

Expand Down
Loading