Unverified Commit 91f2f354 authored by Luke Sandberg's avatar Luke Sandberg Committed by GitHub

refactor: fix non-determinism in resolve package (#90058)

Defer cell creation so it doesn't happen inside of async loops

There are a number of async functions in the resolve package that either directly construct ResolveResult or defer to a turbo task function, this leads to non-determinism when callers invoke these in async loops.  The fix is just to defer cell creation out of these async helper functions.  This was discovered by enabling the `verify_determinism` feature in #90013
parent 86c3d3ee
...@@ -52,7 +52,10 @@ impl ImportMappingReplacement for NextEdgeUnsupportedModuleReplacer { ...@@ -52,7 +52,10 @@ impl ImportMappingReplacement for NextEdgeUnsupportedModuleReplacer {
unsupported_module_source(lookup_path.root().owned().await?, module.clone()) unsupported_module_source(lookup_path.root().owned().await?, module.clone())
.to_resolved() .to_resolved()
.await?; .await?;
Ok(ImportMapResult::Result(ResolveResult::source(ResolvedVc::upcast(source))).cell()) Ok(ImportMapResult::Result(
ResolveResult::source(ResolvedVc::upcast(source)).resolved_cell(),
)
.cell())
} else { } else {
Ok(ImportMapResult::NoEntry.cell()) Ok(ImportMapResult::NoEntry.cell())
} }
......
...@@ -144,7 +144,10 @@ impl NextFontGoogleReplacer { ...@@ -144,7 +144,10 @@ impl NextFontGoogleReplacer {
) )
.cell()), .cell()),
).to_resolved().await?; ).to_resolved().await?;
Ok(ImportMapResult::Result(ResolveResult::source(ResolvedVc::upcast(js_asset))).cell()) Ok(ImportMapResult::Result(
ResolveResult::source(ResolvedVc::upcast(js_asset)).resolved_cell(),
)
.cell())
} }
} }
...@@ -336,7 +339,10 @@ impl NextFontGoogleCssModuleReplacer { ...@@ -336,7 +339,10 @@ impl NextFontGoogleCssModuleReplacer {
.to_resolved() .to_resolved()
.await?; .await?;
Ok(ImportMapResult::Result(ResolveResult::source(ResolvedVc::upcast(css_asset))).cell()) Ok(ImportMapResult::Result(
ResolveResult::source(ResolvedVc::upcast(css_asset)).resolved_cell(),
)
.cell())
} }
} }
...@@ -454,7 +460,9 @@ impl ImportMappingReplacement for NextFontGoogleFontFileReplacer { ...@@ -454,7 +460,9 @@ impl ImportMappingReplacement for NextFontGoogleFontFileReplacer {
fetch_from_google_fonts(*self.fetch_client, url.into(), font_virtual_path.clone()) fetch_from_google_fonts(*self.fetch_client, url.into(), font_virtual_path.clone())
.await? .await?
else { else {
return Ok(ImportMapResult::Result(ResolveResult::unresolvable()).cell()); return Ok(
ImportMapResult::Result(ResolveResult::unresolvable().resolved_cell()).cell(),
);
}; };
let font_source = VirtualSource::new( let font_source = VirtualSource::new(
...@@ -464,7 +472,10 @@ impl ImportMappingReplacement for NextFontGoogleFontFileReplacer { ...@@ -464,7 +472,10 @@ impl ImportMappingReplacement for NextFontGoogleFontFileReplacer {
.to_resolved() .to_resolved()
.await?; .await?;
Ok(ImportMapResult::Result(ResolveResult::source(ResolvedVc::upcast(font_source))).cell()) Ok(ImportMapResult::Result(
ResolveResult::source(ResolvedVc::upcast(font_source)).resolved_cell(),
)
.cell())
} }
} }
......
...@@ -115,9 +115,12 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin { ...@@ -115,9 +115,12 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin {
.resolved_cell() .resolved_cell()
.emit(); .emit();
return Ok(ResolveResultOption::some(*ResolveResult::primary( return Ok(ResolveResultOption::some(
ResolveResultItem::Error(ResolvedVc::cell(err.to_string().into())), ResolveResult::primary(ResolveResultItem::Error(ResolvedVc::cell(
))); err.to_string().into(),
)))
.cell(),
));
} }
FontFallbackResult::Ok(font_fallbacks) => *font_fallbacks, FontFallbackResult::Ok(font_fallbacks) => *font_fallbacks,
}; };
...@@ -166,9 +169,9 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin { ...@@ -166,9 +169,9 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin {
.to_resolved() .to_resolved()
.await?; .await?;
Ok(ResolveResultOption::some(*ResolveResult::source( Ok(ResolveResultOption::some(
ResolvedVc::upcast(js_asset), ResolveResult::source(ResolvedVc::upcast(js_asset)).cell(),
))) ))
} }
"@vercel/turbopack-next/internal/font/local/cssmodule.module.css" => { "@vercel/turbopack-next/internal/font/local/cssmodule.module.css" => {
let request_hash = get_request_hash(query); let request_hash = get_request_hash(query);
...@@ -187,9 +190,12 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin { ...@@ -187,9 +190,12 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin {
.resolved_cell() .resolved_cell()
.emit(); .emit();
return Ok(ResolveResultOption::some(*ResolveResult::primary( return Ok(ResolveResultOption::some(
ResolveResultItem::Error(ResolvedVc::cell(err.to_string().into())), ResolveResult::primary(ResolveResultItem::Error(ResolvedVc::cell(
))); err.to_string().into(),
)))
.cell(),
));
} }
FontFallbackResult::Ok(font_fallbacks) => **font_fallbacks, FontFallbackResult::Ok(font_fallbacks) => **font_fallbacks,
}; };
...@@ -208,9 +214,9 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin { ...@@ -208,9 +214,9 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin {
.to_resolved() .to_resolved()
.await?; .await?;
Ok(ResolveResultOption::some(*ResolveResult::source( Ok(ResolveResultOption::some(
ResolvedVc::upcast(css_asset), ResolveResult::source(ResolvedVc::upcast(css_asset)).cell(),
))) ))
} }
"@vercel/turbopack-next/internal/font/local/font" => { "@vercel/turbopack-next/internal/font/local/font" => {
let NextFontLocalFontFileOptions { let NextFontLocalFontFileOptions {
...@@ -240,9 +246,9 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin { ...@@ -240,9 +246,9 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin {
.to_resolved() .to_resolved()
.await?; .await?;
Ok(ResolveResultOption::some(*ResolveResult::source( Ok(ResolveResultOption::some(
ResolvedVc::upcast(font_source), ResolveResult::source(ResolvedVc::upcast(font_source)).cell(),
))) ))
} }
_ => Ok(ResolveResultOption::none()), _ => Ok(ResolveResultOption::none()),
} }
......
...@@ -191,8 +191,9 @@ impl NextRootParamsMapper { ...@@ -191,8 +191,9 @@ impl NextRootParamsMapper {
.to_resolved() .to_resolved()
.await?; .await?;
let import_map_result = let import_map_result = ImportMapResult::Result(
ImportMapResult::Result(ResolveResult::source(ResolvedVc::upcast(virtual_source))); ResolveResult::source(ResolvedVc::upcast(virtual_source)).resolved_cell(),
);
Ok(import_map_result.cell()) Ok(import_map_result.cell())
} }
...@@ -222,8 +223,9 @@ impl NextRootParamsMapper { ...@@ -222,8 +223,9 @@ impl NextRootParamsMapper {
.to_resolved() .to_resolved()
.await?; .await?;
let import_map_result = let import_map_result = ImportMapResult::Result(
ImportMapResult::Result(ResolveResult::source(ResolvedVc::upcast(virtual_source))); ResolveResult::source(ResolvedVc::upcast(virtual_source)).resolved_cell(),
);
Ok(import_map_result.cell()) Ok(import_map_result.cell())
} }
} }
......
...@@ -322,14 +322,15 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -322,14 +322,15 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
let target = result_from_original_location.ident().path().owned().await?; let target = result_from_original_location.ident().path().owned().await?;
Ok(ResolveResultOption::some(*ResolveResult::primary( Ok(ResolveResultOption::some(
ResolveResultItem::External { ResolveResult::primary(ResolveResultItem::External {
name: request_str.into(), name: request_str.into(),
ty: external_type, ty: external_type,
traced: ExternalTraced::Traced, traced: ExternalTraced::Traced,
target: Some(target), target: Some(target),
}, })
))) .cell(),
))
} }
} }
......
...@@ -148,9 +148,12 @@ impl BeforeResolvePlugin for InvalidImportResolvePlugin { ...@@ -148,9 +148,12 @@ impl BeforeResolvePlugin for InvalidImportResolvePlugin {
.resolved_cell() .resolved_cell()
.emit(); .emit();
ResolveResultOption::some(*ResolveResult::primary(ResolveResultItem::Error( ResolveResultOption::some(
ResolvedVc::cell(self.message.join("\n").into()), ResolveResult::primary(ResolveResultItem::Error(ResolvedVc::cell(
))) self.message.join("\n").into(),
)))
.cell(),
)
} }
} }
...@@ -249,14 +252,15 @@ impl AfterResolvePlugin for NextExternalResolvePlugin { ...@@ -249,14 +252,15 @@ impl AfterResolvePlugin for NextExternalResolvePlugin {
// Replace '/esm/' with '/' to match the CJS version of the file. // Replace '/esm/' with '/' to match the CJS version of the file.
let specifier: RcStr = specifier.replace("/esm/", "/").into(); let specifier: RcStr = specifier.replace("/esm/", "/").into();
Ok(Vc::cell(Some(ResolveResult::primary( Ok(Vc::cell(Some(
ResolveResultItem::External { ResolveResult::primary(ResolveResultItem::External {
name: specifier.clone(), name: specifier.clone(),
ty: ExternalType::CommonJs, ty: ExternalType::CommonJs,
traced: ExternalTraced::Traced, traced: ExternalTraced::Traced,
target: None, target: None,
}, })
)))) .resolved_cell(),
)))
} }
} }
...@@ -328,9 +332,12 @@ impl AfterResolvePlugin for NextNodeSharedRuntimeResolvePlugin { ...@@ -328,9 +332,12 @@ impl AfterResolvePlugin for NextNodeSharedRuntimeResolvePlugin {
.await? .await?
.join(&format!("{base}/{resource_request}"))?; .join(&format!("{base}/{resource_request}"))?;
Ok(Vc::cell(Some(ResolveResult::source(ResolvedVc::upcast( Ok(Vc::cell(Some(
FileSource::new(new_path).to_resolved().await?, ResolveResult::source(ResolvedVc::upcast(
))))) FileSource::new(new_path).to_resolved().await?,
))
.resolved_cell(),
)))
} }
} }
...@@ -430,8 +437,11 @@ impl AfterResolvePlugin for NextSharedRuntimeResolvePlugin { ...@@ -430,8 +437,11 @@ impl AfterResolvePlugin for NextSharedRuntimeResolvePlugin {
let raw_fs_path = fs_path.clone(); let raw_fs_path = fs_path.clone();
let modified_path = raw_fs_path.path.replace("next/dist/esm/", "next/dist/"); let modified_path = raw_fs_path.path.replace("next/dist/esm/", "next/dist/");
let new_path = fs_path.root().await?.join(&modified_path)?; let new_path = fs_path.root().await?.join(&modified_path)?;
Ok(Vc::cell(Some(ResolveResult::source(ResolvedVc::upcast( Ok(Vc::cell(Some(
FileSource::new(new_path).to_resolved().await?, ResolveResult::source(ResolvedVc::upcast(
))))) FileSource::new(new_path).to_resolved().await?,
))
.resolved_cell(),
)))
} }
} }
...@@ -464,12 +464,12 @@ async fn import_mapping_to_result( ...@@ -464,12 +464,12 @@ async fn import_mapping_to_result(
traced: *traced, traced: *traced,
lookup_dir: lookup_dir.clone(), lookup_dir: lookup_dir.clone(),
}, },
ReplacedImportMapping::Ignore => { ReplacedImportMapping::Ignore => ImportMapResult::Result(
ImportMapResult::Result(ResolveResult::primary(ResolveResultItem::Ignore)) ResolveResult::primary(ResolveResultItem::Ignore).resolved_cell(),
} ),
ReplacedImportMapping::Empty => { ReplacedImportMapping::Empty => ImportMapResult::Result(
ImportMapResult::Result(ResolveResult::primary(ResolveResultItem::Empty)) ResolveResult::primary(ResolveResultItem::Empty).resolved_cell(),
} ),
ReplacedImportMapping::PrimaryAlternative(name, context) => { ReplacedImportMapping::PrimaryAlternative(name, context) => {
let request = Request::parse(name.clone()).to_resolved().await?; let request = Request::parse(name.clone()).to_resolved().await?;
ImportMapResult::Alias(request, context.clone()) ImportMapResult::Alias(request, context.clone())
...@@ -514,6 +514,9 @@ impl ValueToString for ImportMapResult { ...@@ -514,6 +514,9 @@ impl ValueToString for ImportMapResult {
Ok(Vc::cell(s.into())) Ok(Vc::cell(s.into()))
} }
ImportMapResult::Alternatives(alternatives) => { ImportMapResult::Alternatives(alternatives) => {
// The .cell() calls happen synchronously during iteration, before try_join()
// runs the futures. This is safe because cells are created in deterministic
// order (the order of alternatives in the Vec).
let strings = alternatives let strings = alternatives
.iter() .iter()
.map(|alternative| alternative.clone().cell().to_string()) .map(|alternative| alternative.clone().cell().to_string())
......
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