Unverified Commit bed5082a authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] fix missing cell dependency (#72330)

### What?

Even when reading cells leads to an error (because cells were removed), we need to add a dependency. The task need to be reexecuted when the removed cell is re-added.

Closes PACK-3387
parent 97d97603
...@@ -474,10 +474,13 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -474,10 +474,13 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
cell: CellId, cell: CellId,
turbo_tasks: &dyn TurboTasksBackendApi<TurboTasksBackend<B>>, turbo_tasks: &dyn TurboTasksBackendApi<TurboTasksBackend<B>>,
) -> Result<Result<TypedCellContent, EventListener>> { ) -> Result<Result<TypedCellContent, EventListener>> {
let mut ctx = self.execute_context(turbo_tasks); fn add_cell_dependency(
let mut task = ctx.task(task_id, TaskDataCategory::Data); mut task: impl TaskGuard,
if let Some(content) = get!(task, CellData { cell }) { reader: Option<TaskId>,
let content = content.clone(); cell: CellId,
task_id: TaskId,
ctx: &mut impl ExecuteContext<'_>,
) {
if let Some(reader) = reader { if let Some(reader) = reader {
let _ = task.add(CachedDataItem::CellDependent { let _ = task.add(CachedDataItem::CellDependent {
cell, cell,
...@@ -498,6 +501,13 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -498,6 +501,13 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
let _ = reader_task.add(CachedDataItem::CellDependency { target, value: () }); let _ = reader_task.add(CachedDataItem::CellDependency { target, value: () });
} }
} }
}
let mut ctx = self.execute_context(turbo_tasks);
let mut task = ctx.task(task_id, TaskDataCategory::Data);
if let Some(content) = get!(task, CellData { cell }) {
let content = content.clone();
add_cell_dependency(task, reader, cell, task_id, &mut ctx);
return Ok(Ok(TypedCellContent( return Ok(Ok(TypedCellContent(
cell.type_id, cell.type_id,
CellContent(Some(content.1)), CellContent(Some(content.1)),
...@@ -511,12 +521,18 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -511,12 +521,18 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
cell_type: cell.type_id cell_type: cell.type_id
} }
) else { ) else {
add_cell_dependency(task, reader, cell, task_id, &mut ctx);
bail!( bail!(
"Cell {cell:?} no longer exists in task {task_id:?} (no cell of this type exists)" "Cell {cell:?} no longer exists in task {} (no cell of this type exists)",
ctx.get_task_description(task_id)
); );
}; };
if cell.index > *max_id { if cell.index > *max_id {
bail!("Cell {cell:?} no longer exists in task {task_id:?} (index out of bounds)"); add_cell_dependency(task, reader, cell, task_id, &mut ctx);
bail!(
"Cell {cell:?} no longer exists in task {} (index out of bounds)",
ctx.get_task_description(task_id)
);
} }
// Cell should exist, but data was dropped or is not serializable. We need to recompute the // Cell should exist, but data was dropped or is not serializable. We need to recompute the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment