Unverified Commit 1bdc679b authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: uncell RequireContextValue (#75683)

This might make a difference if the `RequireContextMap` is huge and used
across many files

More importantly, this seems to solve this failure in the testing
backend on https://github.com/vercel/next.js/pull/75440:

```
called 'Result::unwrap()' on an 'Err' value: Cell is empty
Stack backtrace:
0: <anyhow::Error>::msg::<&str>
1: <turbo_tasks::backend::TypedCellContent>::cast::<turbopack_emascript::analyzer::RequireContextValue>
2: <turbo_tasks::vc::read::ReadVcFuture<turbopack_ecmascript::analyzer::RequireContextValue> as core::future::future::Future>::poll
3: turbopack_ecmascript::analyzer::well_known::replace_well_known::{closure#0}
4: turbopack_ecmascript::analyzer::linker::visit::<mod::analyzer::bench_link::{closure#0}::{closure#0}::{closure#0}::{closure#0}, turbopack_emascript: analyzer: it {closure#0}>::{closure#0}
```
parent cde0f93a
...@@ -26,7 +26,7 @@ use swc_core::{ ...@@ -26,7 +26,7 @@ use swc_core::{
}, },
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, FxIndexSet, ResolvedVc, Vc}; use turbo_tasks::{FxIndexMap, FxIndexSet, Vc};
use turbopack_core::compile_time_info::{ use turbopack_core::compile_time_info::{
CompileTimeDefineValue, DefineableNameSegment, FreeVarReference, CompileTimeDefineValue, DefineableNameSegment, FreeVarReference,
}; };
...@@ -3755,21 +3755,18 @@ pub fn parse_require_context(args: &[JsValue]) -> Result<RequireContextOptions> ...@@ -3755,21 +3755,18 @@ pub fn parse_require_context(args: &[JsValue]) -> Result<RequireContextOptions>
}) })
} }
#[turbo_tasks::value(transparent)] #[derive(Debug, Clone, Eq, PartialEq)]
#[derive(Debug, Clone)]
pub struct RequireContextValue(FxIndexMap<RcStr, RcStr>); pub struct RequireContextValue(FxIndexMap<RcStr, RcStr>);
#[turbo_tasks::value_impl]
impl RequireContextValue { impl RequireContextValue {
#[turbo_tasks::function] pub async fn from_context_map(map: Vc<RequireContextMap>) -> Result<Self> {
pub async fn from_context_map(map: Vc<RequireContextMap>) -> Result<Vc<Self>> {
let mut context_map = FxIndexMap::default(); let mut context_map = FxIndexMap::default();
for (key, entry) in map.await?.iter() { for (key, entry) in map.await?.iter() {
context_map.insert(key.clone(), entry.origin_relative.clone()); context_map.insert(key.clone(), entry.origin_relative.clone());
} }
Ok(Vc::cell(context_map)) Ok(RequireContextValue(context_map))
} }
} }
...@@ -3796,9 +3793,9 @@ pub enum WellKnownFunctionKind { ...@@ -3796,9 +3793,9 @@ pub enum WellKnownFunctionKind {
Require, Require,
RequireResolve, RequireResolve,
RequireContext, RequireContext,
RequireContextRequire(ResolvedVc<RequireContextValue>), RequireContextRequire(RequireContextValue),
RequireContextRequireKeys(ResolvedVc<RequireContextValue>), RequireContextRequireKeys(RequireContextValue),
RequireContextRequireResolve(ResolvedVc<RequireContextValue>), RequireContextRequireResolve(RequireContextValue),
Define, Define,
FsReadMethod(JsWord), FsReadMethod(JsWord),
PathToFileUrl, PathToFileUrl,
...@@ -3845,7 +3842,7 @@ fn is_unresolved_id(i: &Id, unresolved_mark: Mark) -> bool { ...@@ -3845,7 +3842,7 @@ fn is_unresolved_id(i: &Id, unresolved_mark: Mark) -> bool {
#[doc(hidden)] #[doc(hidden)]
pub mod test_utils { pub mod test_utils {
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, ResolvedVc, Vc}; use turbo_tasks::{FxIndexMap, Vc};
use turbopack_core::{compile_time_info::CompileTimeInfo, error::PrettyPrintError}; use turbopack_core::{compile_time_info::CompileTimeInfo, error::PrettyPrintError};
use super::{ use super::{
...@@ -3856,7 +3853,7 @@ pub mod test_utils { ...@@ -3856,7 +3853,7 @@ pub mod test_utils {
analyzer::{ analyzer::{
builtin::replace_builtin, builtin::replace_builtin,
imports::{ImportAnnotations, ImportAttributes}, imports::{ImportAnnotations, ImportAttributes},
parse_require_context, parse_require_context, RequireContextValue,
}, },
utils::module_value_to_well_known_object, utils::module_value_to_well_known_object,
}; };
...@@ -3907,7 +3904,7 @@ pub mod test_utils { ...@@ -3907,7 +3904,7 @@ pub mod test_utils {
map.insert("./c".into(), format!("[context: {}]/c", options.dir).into()); map.insert("./c".into(), format!("[context: {}]/c", options.dir).into());
JsValue::WellKnownFunction(WellKnownFunctionKind::RequireContextRequire( JsValue::WellKnownFunction(WellKnownFunctionKind::RequireContextRequire(
ResolvedVc::cell(map), RequireContextValue(map),
)) ))
} }
Err(err) => v.into_unknown(true, PrettyPrintError(&err).to_string()), Err(err) => v.into_unknown(true, PrettyPrintError(&err).to_string()),
......
use std::mem::take; use std::mem::take;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{ResolvedVc, Vc}; use turbo_tasks::Vc;
use turbopack_core::compile_time_info::CompileTimeInfo; use turbopack_core::compile_time_info::CompileTimeInfo;
use url::Url; use url::Url;
...@@ -354,10 +354,7 @@ pub fn require(args: Vec<JsValue>) -> JsValue { ...@@ -354,10 +354,7 @@ pub fn require(args: Vec<JsValue>) -> JsValue {
} }
/// (try to) statically evaluate `require.context(...)()` /// (try to) statically evaluate `require.context(...)()`
async fn require_context_require( async fn require_context_require(val: RequireContextValue, args: Vec<JsValue>) -> Result<JsValue> {
val: ResolvedVc<RequireContextValue>,
args: Vec<JsValue>,
) -> Result<JsValue> {
if args.is_empty() { if args.is_empty() {
return Ok(JsValue::unknown( return Ok(JsValue::unknown(
JsValue::call( JsValue::call(
...@@ -384,8 +381,7 @@ async fn require_context_require( ...@@ -384,8 +381,7 @@ async fn require_context_require(
)); ));
}; };
let map = val.await?; let Some(m) = val.0.get(s) else {
let Some(m) = map.get(s) else {
return Ok(JsValue::unknown( return Ok(JsValue::unknown(
JsValue::call( JsValue::call(
Box::new(JsValue::WellKnownFunction( Box::new(JsValue::WellKnownFunction(
...@@ -407,12 +403,11 @@ async fn require_context_require( ...@@ -407,12 +403,11 @@ async fn require_context_require(
/// (try to) statically evaluate `require.context(...).keys()` /// (try to) statically evaluate `require.context(...).keys()`
async fn require_context_require_keys( async fn require_context_require_keys(
val: ResolvedVc<RequireContextValue>, val: RequireContextValue,
args: Vec<JsValue>, args: Vec<JsValue>,
) -> Result<JsValue> { ) -> Result<JsValue> {
Ok(if args.is_empty() { Ok(if args.is_empty() {
let map = val.await?; JsValue::array(val.0.keys().cloned().map(|k| k.into()).collect())
JsValue::array(map.keys().cloned().map(|k| k.into()).collect())
} else { } else {
JsValue::unknown( JsValue::unknown(
JsValue::call( JsValue::call(
...@@ -429,7 +424,7 @@ async fn require_context_require_keys( ...@@ -429,7 +424,7 @@ async fn require_context_require_keys(
/// (try to) statically evaluate `require.context(...).resolve()` /// (try to) statically evaluate `require.context(...).resolve()`
async fn require_context_require_resolve( async fn require_context_require_resolve(
val: ResolvedVc<RequireContextValue>, val: RequireContextValue,
args: Vec<JsValue>, args: Vec<JsValue>,
) -> Result<JsValue> { ) -> Result<JsValue> {
if args.len() != 1 { if args.len() != 1 {
...@@ -458,8 +453,7 @@ async fn require_context_require_resolve( ...@@ -458,8 +453,7 @@ async fn require_context_require_resolve(
)); ));
}; };
let map = val.await?; let Some(m) = val.0.get(s) else {
let Some(m) = map.get(s) else {
return Ok(JsValue::unknown( return Ok(JsValue::unknown(
JsValue::call( JsValue::call(
Box::new(JsValue::WellKnownFunction( Box::new(JsValue::WellKnownFunction(
......
...@@ -2880,9 +2880,7 @@ async fn require_context_visitor( ...@@ -2880,9 +2880,7 @@ async fn require_context_visitor(
Ok(JsValue::WellKnownFunction( Ok(JsValue::WellKnownFunction(
WellKnownFunctionKind::RequireContextRequire( WellKnownFunctionKind::RequireContextRequire(
RequireContextValue::from_context_map(map) RequireContextValue::from_context_map(map).await?,
.to_resolved()
.await?,
), ),
)) ))
} }
......
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