refactor(turbo-tasks): Convert local Vcs to non-local Vcs when returning from task functions #74714
+112
−126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ing from task functions
This was referenced Jan 9, 2025
refactor(turbopack/next-api): Implement NonLocalValue for TracedDiGraph and SingleModuleGraph
#74506
Open
Open
Open
bgw
commented
Jan 9, 2025
Comment on lines
+196
to
+208
| fn $get_args_fn<$($arg: TaskInput + 'static,)*>(arg: &dyn MagicAny) -> Result<($($arg,)*)> { | ||
| match arg.downcast_ref::<($($arg,)*)>() { | ||
| Some(($($arg,)*)) => Ok(($($arg.clone(),)*)), | ||
| None => { | ||
| #[cfg(debug_assertions)] | ||
| let context_str = get_debug_downcast_error_msg::<($($arg,)*)>(arg); | ||
| #[cfg(not(debug_assertions))] | ||
| let context_str = "Invalid argument type"; | ||
|
|
||
| anyhow::bail!(context_str); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Moved this inside the macro, which lets us deduplicate the .clone() calls, instead of putting them in each individual trait implementation.
Comment on lines
-282
to
303
| impl<F, Output, Recv, $($arg,)*> TaskFnInputFunctionWithThis<OperationMode, Recv, ($($arg,)*)> for F | ||
| where | ||
| Recv: Sync + Send + 'static, | ||
| $($arg: TaskInput + 'static,)* | ||
| F: Fn(OperationVc<Recv>, $($arg,)*) -> Output + Send + Sync + Clone + 'static, | ||
| Output: TaskOutput + 'static, | ||
| { | ||
| #[allow(non_snake_case)] | ||
| fn functor(&self, this: RawVc, arg: &dyn MagicAny) -> Result<NativeTaskFuture> { | ||
| let task_fn = self.clone(); | ||
| let recv = OperationVc::<Recv>::from(this); | ||
|
|
||
| let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; | ||
| $( | ||
| let $arg = $arg.clone(); | ||
| )* | ||
|
|
||
| let ($($arg,)*) = $get_args_fn::<$($arg,)*>(arg)?; | ||
| Ok(Box::pin(async move { | ||
| Output::try_into_raw_vc((task_fn)(recv, $($arg,)*)) | ||
| let output = (task_fn)(recv, $($arg,)*); | ||
| output_try_into_non_local_raw_vc(output).await | ||
| })) | ||
| } | ||
| } |
There was a problem hiding this comment.
I ended up not implementing support for methods with #[turbo_tasks::function(operation)], given that there's a limited number of callsites, and dynamic dispatch likely couldn't work with methods taking self: OperationVc anyways.
Stats from current PRDefault Build (Increase detected
|
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| buildDuration | 31.7s | 29s | N/A |
| buildDurationCached | 28.7s | 23s | N/A |
| nodeModulesSize | 416 MB | 416 MB | N/A |
| nextStartRea..uration (ms) | 699ms | 900ms |
Client Bundles (main, webpack)
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| 5306-HASH.js gzip | 53.3 kB | 53.3 kB | N/A |
| 8276.HASH.js gzip | 169 B | 168 B | N/A |
| 8377-HASH.js gzip | 5.44 kB | 5.44 kB | N/A |
| bccd1874-HASH.js gzip | 53 kB | 53 kB | ✓ |
| framework-HASH.js gzip | 57.5 kB | 57.5 kB | N/A |
| main-app-HASH.js gzip | 240 B | 242 B | N/A |
| main-HASH.js gzip | 34.1 kB | 34.1 kB | N/A |
| webpack-HASH.js gzip | 1.71 kB | 1.71 kB | N/A |
| Overall change | 53 kB | 53 kB | ✓ |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 39.4 kB | 39.4 kB | ✓ |
| Overall change | 39.4 kB | 39.4 kB | ✓ |
Client Pages
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 193 B | 193 B | ✓ |
| _error-HASH.js gzip | 193 B | 193 B | ✓ |
| amp-HASH.js gzip | 512 B | 510 B | N/A |
| css-HASH.js gzip | 343 B | 342 B | N/A |
| dynamic-HASH.js gzip | 1.84 kB | 1.84 kB | ✓ |
| edge-ssr-HASH.js gzip | 265 B | 265 B | ✓ |
| head-HASH.js gzip | 363 B | 362 B | N/A |
| hooks-HASH.js gzip | 393 B | 392 B | N/A |
| image-HASH.js gzip | 4.57 kB | 4.57 kB | N/A |
| index-HASH.js gzip | 268 B | 268 B | ✓ |
| link-HASH.js gzip | 2.35 kB | 2.34 kB | N/A |
| routerDirect..HASH.js gzip | 328 B | 328 B | ✓ |
| script-HASH.js gzip | 397 B | 397 B | ✓ |
| withRouter-HASH.js gzip | 323 B | 326 B | N/A |
| 1afbb74e6ecf..834.css gzip | 106 B | 106 B | ✓ |
| Overall change | 3.59 kB | 3.59 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 749 B | 747 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Rendered Page Sizes
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| index.html gzip | 524 B | 524 B | ✓ |
| link.html gzip | 538 B | 538 B | ✓ |
| withRouter.html gzip | 520 B | 520 B | ✓ |
| Overall change | 1.58 kB | 1.58 kB | ✓ |
Edge SSR bundle Size
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| edge-ssr.js gzip | 128 kB | 128 kB | N/A |
| page.js gzip | 207 kB | 207 kB | N/A |
| Overall change | 0 B | 0 B | ✓ |
Middleware size
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| middleware-b..fest.js gzip | 670 B | 670 B | ✓ |
| middleware-r..fest.js gzip | 155 B | 156 B | N/A |
| middleware.js gzip | 31.2 kB | 31.2 kB | N/A |
| edge-runtime..pack.js gzip | 844 B | 844 B | ✓ |
| Overall change | 1.51 kB | 1.51 kB | ✓ |
Next Runtimes
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| 274-experime...dev.js gzip | 322 B | 322 B | ✓ |
| 274.runtime.dev.js gzip | 314 B | 314 B | ✓ |
| app-page-exp...dev.js gzip | 367 kB | 367 kB | ✓ |
| app-page-exp..prod.js gzip | 129 kB | 129 kB | ✓ |
| app-page-tur..prod.js gzip | 142 kB | 142 kB | ✓ |
| app-page-tur..prod.js gzip | 138 kB | 138 kB | ✓ |
| app-page.run...dev.js gzip | 355 kB | 355 kB | ✓ |
| app-page.run..prod.js gzip | 126 kB | 126 kB | ✓ |
| app-route-ex...dev.js gzip | 37.6 kB | 37.6 kB | ✓ |
| app-route-ex..prod.js gzip | 25.6 kB | 25.6 kB | ✓ |
| app-route-tu..prod.js gzip | 25.6 kB | 25.6 kB | ✓ |
| app-route-tu..prod.js gzip | 25.4 kB | 25.4 kB | ✓ |
| app-route.ru...dev.js gzip | 39.2 kB | 39.2 kB | ✓ |
| app-route.ru..prod.js gzip | 25.4 kB | 25.4 kB | ✓ |
| pages-api-tu..prod.js gzip | 9.69 kB | 9.69 kB | ✓ |
| pages-api.ru...dev.js gzip | 11.6 kB | 11.6 kB | ✓ |
| pages-api.ru..prod.js gzip | 9.68 kB | 9.68 kB | ✓ |
| pages-turbo...prod.js gzip | 21.7 kB | 21.7 kB | ✓ |
| pages.runtim...dev.js gzip | 27.5 kB | 27.5 kB | ✓ |
| pages.runtim..prod.js gzip | 21.7 kB | 21.7 kB | ✓ |
| server.runti..prod.js gzip | 916 kB | 916 kB | ✓ |
| Overall change | 2.46 MB | 2.46 MB | ✓ |
build cache Overall increase ⚠️
| vercel/next.js canary | vercel/next.js bgw/return-values-should-be-non-local | Change | |
|---|---|---|---|
| 0.pack gzip | 2.09 MB | 2.09 MB | |
| index.pack gzip | 75.5 kB | 73.9 kB | N/A |
| Overall change | 2.09 MB | 2.09 MB |
Diff details
Diff for main-HASH.js
Diff too large to display
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.