Prevent accidentally re-creating ResolvedVc via deref by using a deprecated fn (#73428)

Author: arlyon

crates/next-api/src/app.rs

@@ -1155,7 +1155,7 @@ impl AppEndpoint {
             )
             .await?;
             server_assets.insert(server_action_manifest.manifest);
-            Some(server_action_manifest.loader.to_resolved().await?)
+            Some(server_action_manifest.loader)
         } else {
             None
         };
@@ -1340,7 +1340,7 @@ impl AppEndpoint {
                 }
 
                 AppEndpointOutput::Edge {
-                    files: app_entry_chunks.to_resolved().await?,
+                    files: *app_entry_chunks,
                     server_assets: ResolvedVc::cell(
                         server_assets.iter().cloned().collect::<Vec<_>>(),
                     ),

crates/next-api/src/dynamic_imports.rs

@@ -236,7 +236,7 @@ async fn get_next_dynamic_edges(
             .iter()
             .map(|&referenced_module| async move {
                 Ok(NextDynamicVisitEntry::Module(
-                    referenced_module.to_resolved().await?,
+                    referenced_module,
                     referenced_module.ident().to_string().await?,
                 ))
             })
@@ -247,7 +247,7 @@ async fn get_next_dynamic_edges(
     if let Some(dynamic_imports_map) = *dynamic_imports_map.await? {
         edges.reserve_exact(1);
         edges.push(NextDynamicVisitEntry::DynamicImportsMap(
-            dynamic_imports_map.to_resolved().await?,
+            dynamic_imports_map,
         ));
     }
     Ok(Vc::cell(edges))

crates/next-api/src/nft_json.rs

@@ -168,7 +168,7 @@ impl Asset for NftJsonAsset {
         let this = &*self.await?;
         let mut result = BTreeSet::new();
 
-        let chunk = this.chunk.to_resolved().await?;
+        let chunk = this.chunk;
         let entries = this
             .additional_assets
             .iter()
@@ -180,7 +180,7 @@ impl Asset for NftJsonAsset {
                 continue;
             }
 
-            if chunk == referenced_chunk.to_resolved().await? {
+            if chunk.eq(referenced_chunk) {
                 continue;
             }
 

crates/next-api/src/versioned_content_map.rs

@@ -171,8 +171,7 @@ impl VersionedContentMap {
         };
 
         if let Some(generate_source_map) =
-            Vc::try_resolve_sidecast::<Box<dyn GenerateSourceMap>>(*asset.to_resolved().await?)
-                .await?
+            ResolvedVc::try_sidecast::<Box<dyn GenerateSourceMap>>(*asset).await?
         {
             Ok(if let Some(section) = section {
                 generate_source_map.by_section(section)

crates/next-core/src/app_structure.rs

@@ -1145,7 +1145,7 @@ async fn directory_tree_to_entrypoints_internal_untraced(
     // Pass down layouts from each tree to apply segment config when adding route.
     let root_layouts = if let Some(layout) = modules.layout {
         let mut layouts = root_layouts.await?.clone_value();
-        layouts.push(layout.to_resolved().await?);
+        layouts.push(layout);
         ResolvedVc::cell(layouts)
     } else {
         root_layouts
@@ -1168,10 +1168,7 @@ async fn directory_tree_to_entrypoints_internal_untraced(
             app_dir,
             &mut result,
             app_page.complete(PageType::Page)?,
-            loader_tree
-                .context("loader tree should be created for a page/default")?
-                .to_resolved()
-                .await?,
+            loader_tree.context("loader tree should be created for a page/default")?,
         );
     }
 
@@ -1180,7 +1177,7 @@ async fn directory_tree_to_entrypoints_internal_untraced(
             app_dir,
             &mut result,
             app_page.complete(PageType::Route)?,
-            route.to_resolved().await?,
+            route,
             root_layouts,
         );
     }
@@ -1352,9 +1349,7 @@ async fn directory_tree_to_entrypoints_internal_untraced(
                             &mut result,
                             page.clone(),
                             loader_tree
-                                .context("loader tree should be created for a page/default")?
-                                .to_resolved()
-                                .await?,
+                                .context("loader tree should be created for a page/default")?,
                         );
                     }
                 }

crates/next-core/src/next_app/app_client_references_chunks.rs

@@ -142,7 +142,6 @@ pub async fn get_app_client_references_chunks(
             }
             for client_reference in app_client_references.client_references.iter() {
                 if let Some(server_component) = client_reference.server_component() {
-                    let server_component = server_component.to_resolved().await?;
                     client_references_by_server_component
                         .entry(server_component)
                         .or_default()
@@ -268,8 +267,7 @@ pub async fn get_app_client_references_chunks(
                         current_client_chunks = client_chunks;
                     }
 
-                    layout_segment_client_chunks
-                        .insert(server_component.to_resolved().await?, client_chunks);
+                    layout_segment_client_chunks.insert(server_component, client_chunks);
 
                     for &client_reference_ty in client_reference_types.iter() {
                         if let ClientReferenceType::EcmascriptClientReference { .. } =

crates/next-core/src/next_client_reference/visit_client_reference.rs

@@ -354,9 +354,9 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
             let referenced_modules = primary_referenced_modules(*parent_module).await?;
 
             let referenced_modules = referenced_modules.iter().map(|module| async move {
-                let module = module.to_resolved().await?;
                 if let Some(client_reference_module) =
-                    ResolvedVc::try_downcast_type::<EcmascriptClientReferenceModule>(module).await?
+                    ResolvedVc::try_downcast_type::<EcmascriptClientReferenceModule>(*module)
+                        .await?
                 {
                     return Ok(VisitClientReferenceNode {
                         state: node.state,
@@ -385,7 +385,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
                 }
 
                 if let Some(css_client_reference_asset) =
-                    ResolvedVc::try_downcast_type::<CssModuleAsset>(module).await?
+                    ResolvedVc::try_downcast_type::<CssModuleAsset>(*module).await?
                 {
                     return Ok(VisitClientReferenceNode {
                         state: node.state,
@@ -407,7 +407,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
                 }
 
                 if let Some(server_component_asset) =
-                    ResolvedVc::try_downcast_type::<NextServerComponentModule>(module).await?
+                    ResolvedVc::try_downcast_type::<NextServerComponentModule>(*module).await?
                 {
                     return Ok(VisitClientReferenceNode {
                         state: VisitClientReferenceNodeState::InServerComponent {
@@ -425,7 +425,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
                         return Ok(VisitClientReferenceNode {
                             state: VisitClientReferenceNodeState::InServerUtil,
                             ty: VisitClientReferenceNodeType::ServerUtilEntry(
-                                module,
+                                *module,
                                 module.ident().to_string().await?,
                             ),
                         });
@@ -435,7 +435,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
                 Ok(VisitClientReferenceNode {
                     state: node.state,
                     ty: VisitClientReferenceNodeType::Internal(
-                        module,
+                        *module,
                         module.ident().to_string().await?,
                     ),
                 })

crates/next-core/src/next_dynamic/visit_dynamic.rs

@@ -30,10 +30,7 @@ impl NextDynamicEntries {
                         .iter()
                         .copied()
                         .map(|m| async move {
-                            Ok(VisitDynamicNode::Internal(
-                                m.to_resolved().await?,
-                                m.ident().to_string().await?,
-                            ))
+                            Ok(VisitDynamicNode::Internal(m, m.ident().to_string().await?))
                         })
                         .try_join()
                         .await?,
@@ -96,9 +93,8 @@ impl Visit<VisitDynamicNode> for VisitDynamic {
             let referenced_modules = primary_referenced_modules(*module).await?;
 
             let referenced_modules = referenced_modules.iter().map(|module| async move {
-                let module = module.to_resolved().await?;
                 if let Some(next_dynamic_module) =
-                    ResolvedVc::try_downcast_type::<NextDynamicEntryModule>(module).await?
+                    ResolvedVc::try_downcast_type::<NextDynamicEntryModule>(*module).await?
                 {
                     return Ok(VisitDynamicNode::Dynamic(
                         next_dynamic_module,
@@ -107,7 +103,7 @@ impl Visit<VisitDynamicNode> for VisitDynamic {
                 }
 
                 Ok(VisitDynamicNode::Internal(
-                    module,
+                    *module,
                     module.ident().to_string().await?,
                 ))
             });

turbopack/crates/turbo-tasks/src/vc/resolved.rs

@@ -18,6 +18,7 @@ use std::{
     time::Duration,
 };
 
+use anyhow::Result;
 use auto_hash_map::{AutoMap, AutoSet};
 use indexmap::{IndexMap, IndexSet};
 use serde::{Deserialize, Serialize};
@@ -40,6 +41,16 @@ where
     pub(crate) node: Vc<T>,
 }
 
+impl<T> ResolvedVc<T> {
+    /// This function exists to intercept calls to Vc::to_resolved through dereferencing
+    /// a ResolvedVc. Converting to Vc and re-resolving it puts unnecessary stress on
+    /// the turbo tasks engine.
+    #[deprecated(note = "No point in resolving a vc that is already resolved")]
+    pub async fn to_resolved(self) -> Result<Self> {
+        Ok(self)
+    }
+}
+
 impl<T> Copy for ResolvedVc<T> where T: ?Sized {}
 
 impl<T> Clone for ResolvedVc<T>

turbopack/crates/turbopack-browser/src/ecmascript/update.rs

@@ -40,8 +40,7 @@ pub(super) async fn update_ecmascript_chunk(
     for (id, from_hash) in &from.entries_hashes {
         if let Some(entry) = entries.get(id) {
             if *entry.hash.await? != *from_hash {
-                let resolved_code = entry.code.to_resolved().await?;
-                modified.insert(id.clone(), resolved_code);
+                modified.insert(id.clone(), entry.code);
             }
         } else {
             deleted.insert(id.clone(), *from_hash);
@@ -51,10 +50,7 @@ pub(super) async fn update_ecmascript_chunk(
     // Remaining entries are added
     for (id, entry) in entries.iter() {
         if !from.entries_hashes.contains_key(id) {
-            added.insert(
-                id.clone(),
-                (*entry.hash.await?, entry.code.to_resolved().await?),
-            );
+            added.insert(id.clone(), (*entry.hash.await?, entry.code));
         }
     }