Skip to content

Revert "Turbopack: skip invalidating a task on cell/output change when the dependency is outdated" #84526

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 1 commit into from
Oct 5, 2025
Merged

Revert "Turbopack: skip invalidating a task on cell/output change when the dependency is outdated" #84526

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion test/e2e/app-dir/no-double-tailwind-execution/app/globals.css
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions test/e2e/app-dir/no-double-tailwind-execution/app/layout.tsx
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions test/e2e/app-dir/no-double-tailwind-execution/app/page.tsx
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions test/e2e/app-dir/no-double-tailwind-execution/next.config.js
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions test/e2e/app-dir/no-double-tailwind-execution/no-double-tailwind-execution.test.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/e2e/app-dir/no-double-tailwind-execution/package.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions test/e2e/app-dir/no-double-tailwind-execution/postcss.config.mjs
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@ pub enum AnyOperation {
ConnectChild(connect_child::ConnectChildOperation),
Invalidate(invalidate::InvalidateOperation),
UpdateOutput(update_output::UpdateOutputOperation),
UpdateCell(update_cell::UpdateCellOperation),
CleanupOldEdges(cleanup_old_edges::CleanupOldEdgesOperation),
AggregationUpdate(aggregation_update::AggregationUpdateQueue),
Nested(Vec<AnyOperation>),
Expand All @@ -613,7 +612,6 @@ impl AnyOperation {
AnyOperation::ConnectChild(op) => op.execute(ctx),
AnyOperation::Invalidate(op) => op.execute(ctx),
AnyOperation::UpdateOutput(op) => op.execute(ctx),
AnyOperation::UpdateCell(op) => op.execute(ctx),
AnyOperation::CleanupOldEdges(op) => op.execute(ctx),
AnyOperation::AggregationUpdate(op) => op.execute(ctx),
AnyOperation::Nested(ops) => {
Expand All @@ -628,7 +626,6 @@ impl AnyOperation {
impl_operation!(ConnectChild connect_child::ConnectChildOperation);
impl_operation!(Invalidate invalidate::InvalidateOperation);
impl_operation!(UpdateOutput update_output::UpdateOutputOperation);
impl_operation!(UpdateCell update_cell::UpdateCellOperation);
impl_operation!(CleanupOldEdges cleanup_old_edges::CleanupOldEdgesOperation);
impl_operation!(AggregationUpdate aggregation_update::AggregationUpdateQueue);

Expand All @@ -642,5 +639,6 @@ pub use self::{
cleanup_old_edges::OutdatedEdge,
connect_children::connect_children,
prepare_new_children::prepare_new_children,
update_cell::UpdateCellOperation,
update_collectible::UpdateCollectibleOperation,
};
103 changes: 11 additions & 92 deletions turbopack/crates/turbo-tasks-backend/src/backend/operation/update_cell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
use std::mem::take;

use serde::{Deserialize, Serialize};
use smallvec::SmallVec;
use turbo_tasks::{CellId, TaskId, backend::CellContent};

#[cfg(feature = "trace_task_dirty")]
use crate::backend::operation::invalidate::TaskDirtyCause;
use crate::{
backend::{
TaskDataCategory,
operation::{
AggregationUpdateQueue, ExecuteContext, Operation, TaskGuard,
invalidate::make_task_dirty_internal,
},
operation::{ExecuteContext, InvalidateOperation, TaskGuard},
storage::{get_many, remove},
},
data::{CachedDataItem, CachedDataItemKey, CellRef},
data::{CachedDataItem, CachedDataItemKey},
};

#[derive(Serialize, Deserialize, Clone, Default)]
#[allow(clippy::large_enum_variant)]
pub enum UpdateCellOperation {
InvalidateWhenCellDependency {
cell_ref: CellRef,
dependent_tasks: SmallVec<[TaskId; 4]>,
queue: AggregationUpdateQueue,
},
AggregationUpdate {
queue: AggregationUpdateQueue,
},
#[default]
Done,
}
pub struct UpdateCellOperation;

impl UpdateCellOperation {
pub fn run(task_id: TaskId, cell: CellId, content: CellContent, mut ctx: impl ExecuteContext) {
Expand Down Expand Up @@ -59,7 +39,7 @@ impl UpdateCellOperation {
// This is a hack for the streaming hack. Stateful tasks are never recomputed, so this forces invalidation for them in case of this hack.
task.has_key(&CachedDataItemKey::Stateful {}))
{
let dependent_tasks = get_many!(
let dependent = get_many!(
task,
CellDependent { cell: dependent_cell, task }
if dependent_cell == cell
Expand All @@ -69,78 +49,17 @@ impl UpdateCellOperation {
drop(task);
drop(old_content);

UpdateCellOperation::InvalidateWhenCellDependency {
cell_ref: CellRef {
task: task_id,
cell,
InvalidateOperation::run(
dependent,
#[cfg(feature = "trace_task_dirty")]
TaskDirtyCause::CellChange {
value_type: cell.type_id,
},
dependent_tasks,
queue: AggregationUpdateQueue::new(),
}
.execute(&mut ctx);
ctx,
);
} else {
drop(task);
drop(old_content);
}
}
}

impl Operation for UpdateCellOperation {
fn execute(mut self, ctx: &mut impl ExecuteContext) {
loop {
ctx.operation_suspend_point(&self);
match self {
UpdateCellOperation::InvalidateWhenCellDependency {
cell_ref,
ref mut dependent_tasks,
ref mut queue,
} => {
if let Some(dependent_task_id) = dependent_tasks.pop() {
if ctx.is_once_task(dependent_task_id) {
// once tasks are never invalidated
continue;
}
let dependent = ctx.task(dependent_task_id, TaskDataCategory::All);
if dependent.has_key(&CachedDataItemKey::OutdatedCellDependency {
target: cell_ref,
}) {
// cell dependency is outdated, so it hasn't read the cell yet
// and doesn't need to be invalidated
continue;
}
if !dependent
.has_key(&CachedDataItemKey::CellDependency { target: cell_ref })
{
// cell dependency has been removed, so the task doesn't depend on the
// cell anymore and doesn't need to be
// invalidated
continue;
}
make_task_dirty_internal(
dependent,
dependent_task_id,
true,
#[cfg(feature = "trace_task_dirty")]
TaskDirtyCause::CellChange {
value_type: cell_ref.cell.type_id,
},
queue,
ctx,
);
}
if dependent_tasks.is_empty() {
self = UpdateCellOperation::AggregationUpdate { queue: take(queue) };
}
}
UpdateCellOperation::AggregationUpdate { ref mut queue } => {
if queue.process(ctx) {
self = UpdateCellOperation::Done
}
}
UpdateCellOperation::Done => {
return;
}
}
}
}
}
28 changes: 5 additions & 23 deletions turbopack/crates/turbo-tasks-backend/src/backend/operation/update_output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::{
TaskDataCategory,
operation::{
AggregationUpdateQueue, ExecuteContext, Operation, TaskGuard,
invalidate::make_task_dirty_internal,
invalidate::{make_task_dirty, make_task_dirty_internal},
},
storage::{get, get_many},
},
Expand All @@ -25,6 +25,7 @@ use crate::{
#[derive(Serialize, Deserialize, Clone, Default)]
pub enum UpdateOutputOperation {
MakeDependentTasksDirty {
#[cfg(feature = "trace_task_dirty")]
task_id: TaskId,
dependent_tasks: SmallVec<[TaskId; 4]>,
children: SmallVec<[TaskId; 4]>,
Expand Down Expand Up @@ -131,6 +132,7 @@ impl UpdateOutputOperation {
}

UpdateOutputOperation::MakeDependentTasksDirty {
#[cfg(feature = "trace_task_dirty")]
task_id,
dependent_tasks,
children,
Expand All @@ -146,35 +148,15 @@ impl Operation for UpdateOutputOperation {
ctx.operation_suspend_point(&self);
match self {
UpdateOutputOperation::MakeDependentTasksDirty {
#[cfg(feature = "trace_task_dirty")]
task_id,
ref mut dependent_tasks,
ref mut children,
ref mut queue,
} => {
if let Some(dependent_task_id) = dependent_tasks.pop() {
if ctx.is_once_task(dependent_task_id) {
// once tasks are never invalidated
continue;
}
let dependent = ctx.task(dependent_task_id, TaskDataCategory::All);
if dependent.has_key(&CachedDataItemKey::OutdatedOutputDependency {
target: task_id,
}) {
// output dependency is outdated, so it hasn't read the output yet
// and doesn't need to be invalidated
continue;
}
if !dependent
.has_key(&CachedDataItemKey::OutputDependency { target: task_id })
{
// output dependency has been removed, so the task doesn't depend on the
// output anymore and doesn't need to be invalidated
continue;
}
make_task_dirty_internal(
dependent,
make_task_dirty(
dependent_task_id,
true,
#[cfg(feature = "trace_task_dirty")]
TaskDirtyCause::OutputChange { task_id },
queue,
Expand Down
Loading