Skip to content
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

fix recomputation when reading gc'ed cells from in progress tasks #75969

Merged
merged 2 commits into from
Feb 14, 2025
Merged

fix recomputation when reading gc'ed cells from in progress tasks #75969

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f042b1d
fix recomputation when reading gc'ed cells from in progress tasks
sokra Feb 12, 2025
7bbc350
clippy
sokra Feb 13, 2025
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
34 changes: 33 additions & 1 deletion turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,39 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
});

// Schedule the task, if not already scheduled
if task.add(CachedDataItem::new_scheduled(
if let Some(existing) = get!(task, InProgress) {
match existing {
InProgressState::InProgress(box InProgressStateInner { stale, .. }) => {
if !*stale {
let idx = get!(
task,
CellTypeMaxIndex {
Copy link
Member Author

Choose a reason for hiding this comment

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

In progress tasks are never gced and have their counts in task locals anyway

cell_type: cell.type_id
}
)
.copied()
.unwrap_or_default();
if cell.index <= idx {
// The current execution is past the cell, so we need to reexecute.
let Some(InProgressState::InProgress(box InProgressStateInner {
stale,
..
})) = get_mut!(task, InProgress)
else {
unreachable!();
};
*stale = true;
} else {
// The cell will still be written in the current execution, so we can
// just continue here.
}
}
}
InProgressState::Scheduled { .. } => {
// Already scheduled
}
}
} else if task.add(CachedDataItem::new_scheduled(
self.get_task_desc_fn(task_id),
)) {
turbo_tasks.schedule(task_id);
Expand Down
Loading