Files
next.js/turbopack/crates/turbo-tasks-backend/tests/recompute.rs
548fbca6df turbopack: Remove Vc::resolve(), migrate all callsites to Vc::to_resolved() (#91725)
### What?

Remove the `Vc::resolve()` method and migrate all ~37 callsites across
the turbopack and next crates to use `Vc::to_resolved()` instead.

### Why?

`Vc::resolve()` returned `Result<Vc<T>>` — a resolved `Vc` with no
static guarantee that it is resolved. This is a footgun: the type is
indistinguishable from any other unresolved `Vc<T>`, so it's easy to
accidentally lose the "resolved" property at a type boundary or store it
in a struct without the compiler enforcing invariants.

`Vc::to_resolved()` returns `Result<ResolvedVc<T>>`, which statically
encodes the resolved guarantee in the type. `ResolvedVc<T>` implements
`Deref<Target = Vc<T>>`, so it coerces seamlessly to `Vc<T>` at call
sites that still need the plain type. Removing `Vc::resolve()`
eliminates this footgun entirely and pushes callers toward the type-safe
API.

### How?

- Removed the `Vc::resolve()` method from `turbo-tasks/src/vc/mod.rs`.
- Updated `Vc::to_resolved()` to construct the inner `Vc` directly via
`self.node.resolve()` rather than calling `self.resolve()`.
- Updated `Vc::debug_identifier` to go through `to_resolved()`.
- Updated `TaskInput::resolve_input` for `Vc<T>` to use `to_resolved()`.
- Updated all callsites across turbopack-core, turbopack-ecmascript,
turbopack-resolve, turbopack-browser, turbopack-css, turbopack-node,
turbopack-ecmascript-runtime, next-api, next-core, and test/fuzz files:
- Where `ResolvedVc<T>` is usable (deref coercion handles method calls,
or the value is stored in a `HashMap` etc.), simply replaced
`.resolve()` with `.to_resolved()`.
- Where a plain `Vc<T>` is strictly required by a callee signature,
dereferenced with `*x.to_resolved().await?`.
- Updated the `AfterResolvePluginWithCondition` type alias in
`resolve/mod.rs` to use `ResolvedVc<AfterResolvePluginCondition>` now
that the tuple member is produced by `to_resolved()`.
- Updated doc comments referencing `Vc::resolve` to point to
`Vc::to_resolved`.

Verified with `cargo check --all-targets` — compiles cleanly with no
errors.

---------

Co-authored-by: Tobias Koppers <[email protected]>
Co-authored-by: Claude <[email protected]>
2026-03-26 11:30:36 -07:00

243 lines
7.4 KiB
Rust

#![feature(arbitrary_self_types)]
#![feature(arbitrary_self_types_pointers)]
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
use anyhow::Result;
use turbo_tasks::{
ResolvedVc, State, Vc, unmark_top_level_task_may_leak_eventually_consistent_state,
};
use turbo_tasks_testing::{Registration, register, run, run_once};
static REGISTRATION: Registration = register!();
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn recompute() {
run_once(&REGISTRATION, || async {
unmark_top_level_task_may_leak_eventually_consistent_state();
let input = ChangingInput {
state: State::new(1),
}
.cell();
let input2 = ChangingInput {
state: State::new(10),
}
.cell();
let output = compute(input, input2);
let read = output.await?;
assert_eq!(read.state_value, 1);
assert_eq!(read.state_value2, 10);
let random_value = read.random_value;
println!("changing input");
input.await?.state.set(2);
let read = output.strongly_consistent().await?;
assert_eq!(read.state_value, 2);
assert_ne!(read.random_value, random_value);
let random_value = read.random_value;
println!("changing input2");
input2.await?.state.set(20);
let read = output.strongly_consistent().await?;
assert_eq!(read.state_value2, 20);
assert_ne!(read.random_value, random_value);
let random_value = read.random_value;
println!("changing input");
input.await?.state.set(5);
let read = output.strongly_consistent().await?;
assert_eq!(read.state_value, 5);
assert_eq!(read.state_value2, 42);
assert_ne!(read.random_value, random_value);
let random_value = read.random_value;
println!("changing input2");
input2.await?.state.set(30);
let read = output.strongly_consistent().await?;
assert_eq!(read.random_value, random_value);
anyhow::Ok(())
})
.await
.unwrap()
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn immutable_analysis() {
run_once(&REGISTRATION, || async {
unmark_top_level_task_may_leak_eventually_consistent_state();
let input = ChangingInput {
state: State::new(1),
}
.resolved_cell();
// Verify
let vc_holder = VcHolder { vc: input }.resolved_cell();
let read = vc_holder.compute().strongly_consistent().await?;
assert_eq!(read.state_value, 1);
assert_eq!(read.state_value2, 1);
let random_value = read.random_value;
println!("changing input1");
input.await?.state.set(30);
let read = vc_holder.compute().strongly_consistent().await?;
assert_eq!(read.state_value, 30);
assert_eq!(read.state_value2, 42);
assert_ne!(read.random_value, random_value);
anyhow::Ok(())
})
.await
.unwrap()
}
#[turbo_tasks::value]
struct ChangingInput {
state: State<u32>,
}
#[turbo_tasks::value]
struct VcHolder {
vc: ResolvedVc<ChangingInput>,
}
#[turbo_tasks::value_impl]
impl VcHolder {
#[turbo_tasks::function]
fn compute(&self) -> Vc<Output> {
compute(*self.vc, *self.vc)
}
}
#[turbo_tasks::value]
struct Output {
state_value: u32,
state_value2: u32,
random_value: u32,
}
#[turbo_tasks::function]
async fn compute(input: Vc<ChangingInput>, input2: Vc<ChangingInput>) -> Result<Vc<Output>> {
let state_value = *input.await?.state.get();
let state_value2 = if state_value < 5 {
*compute2(input2).await?
} else {
42
};
let random_value = rand::random();
Ok(Output {
state_value,
state_value2,
random_value,
}
.cell())
}
#[turbo_tasks::function]
async fn compute2(input: Vc<ChangingInput>) -> Result<Vc<u32>> {
let state_value = *input.await?.state.get();
Ok(Vc::cell(state_value))
}
// ============================================================================
// recompute_dependency test - verifies dependent tasks re-execute correctly
// ============================================================================
/// Tests that when a task's dependency changes, both the inner and outer
/// tasks re-execute correctly and return updated values.
/// This tests the basic dependency propagation through a simple two-task chain.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn recompute_dependency() {
run(&REGISTRATION, || async {
unmark_top_level_task_may_leak_eventually_consistent_state();
let input = *get_dependency_input().to_resolved().await?;
// Reset state to 1 at the start of each iteration (important for multi-run tests)
input.await?.state.set(1);
// Initial execution - establishes dependency chain:
// outer_compute -> inner_compute -> input.state
let output = outer_compute(input);
let read = output.strongly_consistent().await?;
println!(
"first read: value={}, inner_random={}, outer_random={}",
read.value, read.inner_random, read.outer_random
);
assert_eq!(read.value, 1);
let prev_inner_random = read.inner_random;
let prev_outer_random = read.outer_random;
// Change state - should invalidate inner_compute,
// which should then invalidate outer_compute
println!("changing input");
input.await?.state.set(2);
let read = output.strongly_consistent().await?;
println!(
"second read: value={}, inner_random={}, outer_random={}",
read.value, read.inner_random, read.outer_random
);
// Value should be updated
assert_eq!(read.value, 2);
// Inner task should have re-executed (different random)
assert_ne!(
read.inner_random, prev_inner_random,
"inner_compute should have re-executed"
);
// CRITICAL: Outer task should ALSO have re-executed
// This is what the bug broke - outer_compute wasn't being
// invalidated because its output_dependent edge was removed
assert_ne!(
read.outer_random, prev_outer_random,
"outer_compute should have re-executed due to dependency on inner_compute"
);
anyhow::Ok(())
})
.await
.unwrap();
}
#[turbo_tasks::function]
fn get_dependency_input() -> Vc<ChangingInput> {
ChangingInput {
state: State::new(1),
}
.cell()
}
#[turbo_tasks::value]
struct DependencyOutput {
value: u32,
inner_random: u32,
outer_random: u32,
}
/// Inner task - reads state directly, returns value with embedded random
#[turbo_tasks::function]
async fn inner_compute(input: Vc<ChangingInput>) -> Result<Vc<u32>> {
println!("inner_compute()");
let value = *input.await?.state.get();
// Combine value with random to detect re-execution
// Value in lower 16 bits, random in upper 16 bits
Ok(Vc::cell(value | (rand::random::<u32>() << 16)))
}
/// Outer task - depends on inner_compute
#[turbo_tasks::function]
async fn outer_compute(input: Vc<ChangingInput>) -> Result<Vc<DependencyOutput>> {
println!("outer_compute()");
let inner_result = *inner_compute(input).await?;
let value = inner_result & 0xFFFF;
let inner_random = inner_result >> 16;
Ok(DependencyOutput {
value,
inner_random,
outer_random: rand::random(),
}
.cell())
}