refactor: rename derefOption to stealCell and migrate atomicRefCell to Stealcell (#12974)

* refactor: rename derefOption to stealcell

* chore: migrate atomicRefcell to StealCell

* chore: fix cargo shear

* chore: add type_name to error msg

* chore: fix bench

Author: hardfist

Cargo.lock

@@ -28,7 +28,7 @@ impl JsModuleGraph {
 
   fn as_ref(&self) -> napi::Result<(&'static Compilation, &'static ModuleGraph)> {
     let compilation = unsafe { self.compilation.as_ref() };
-    if compilation.build_module_graph_artifact.is_none() {
+    if compilation.build_module_graph_artifact.is_stolen() {
       return Err(napi::Error::from_reason(
         "ModuleGraph is not available during module graph building phase".to_string(),
       ));
@@ -263,7 +263,7 @@ impl JsModuleGraph {
   pub fn is_async(&self, module: ModuleObjectRef) -> napi::Result<bool> {
     let (compilation, _) = self.as_ref()?;
     Ok(ModuleGraph::is_async(
-      &compilation.async_modules_artifact.borrow(),
+      &compilation.async_modules_artifact,
       &module.identifier,
     ))
   }

crates/rspack_binding_api/src/module_graph.rs

@@ -10,7 +10,6 @@ version.workspace = true
 anymap = { workspace = true }
 async-recursion = { workspace = true }
 async-trait = { workspace = true }
-atomic_refcell = { workspace = true }
 bitflags = { workspace = true }
 cow-utils = { workspace = true }
 dashmap = { workspace = true, features = ["rayon"] }

crates/rspack_core/Cargo.toml

@@ -17,9 +17,7 @@ mod module_ids_artifact;
 mod process_runtime_requirements_cache_artifact;
 mod side_effects_do_optimize_artifact;
 
-use std::{mem, sync::Arc};
-
-use atomic_refcell::AtomicRefCell;
+use std::mem;
 
 use crate::incremental::{Incremental, IncrementalPasses};
 
@@ -81,17 +79,6 @@ impl<T: ArtifactExt + Into<crate::BindingCell<T>>> ArtifactExt for crate::Bindin
   }
 }
 
-// Implementation for Arc<AtomicRefCell<T>> - used for shared artifacts
-impl<T: ArtifactExt> ArtifactExt for Arc<AtomicRefCell<T>> {
-  const PASS: IncrementalPasses = T::PASS;
-
-  fn recover(incremental: &Incremental, new: &mut Self, old: &mut Self) {
-    if Self::should_recover(incremental) {
-      mem::swap(new, old);
-    }
-  }
-}
-
 pub use async_modules_artifact::AsyncModulesArtifact;
 pub(crate) use build_chunk_graph_artifact::use_code_splitting_cache;
 pub use build_chunk_graph_artifact::*;

crates/rspack_core/src/artifacts/mod.rs

@@ -383,11 +383,8 @@ impl ChunkGraph {
           .hash(&mut hasher);
         module.source_types(mg).dyn_hash(&mut hasher);
 
-        ModuleGraph::is_async(
-          &compilation.async_modules_artifact.borrow(),
-          &module_identifier,
-        )
-        .dyn_hash(&mut hasher);
+        ModuleGraph::is_async(&compilation.async_modules_artifact, &module_identifier)
+          .dyn_hash(&mut hasher);
         let exports_info =
           mg.get_prefetched_exports_info(&module_identifier, PrefetchExportsInfoMode::Full);
         let (entry, exports) = exports_info.meta();

crates/rspack_core/src/chunk_graph/chunk_graph_module.rs

@@ -37,10 +37,9 @@ impl Compilation {
       self.module_executor = Some(module_executor);
     }
 
-    let artifact = self.build_module_graph_artifact.take();
-    self
-      .build_module_graph_artifact
-      .replace(build_module_graph(self, artifact).await?);
+    let artifact = self.build_module_graph_artifact.steal();
+    let artifact = build_module_graph(self, artifact).await?;
+    self.build_module_graph_artifact = artifact.into();
 
     self.in_finish_make.store(true, Ordering::Release);
 

crates/rspack_core/src/compilation/build_module_graph/mod.rs

@@ -23,10 +23,9 @@ impl Compilation {
   pub async fn finish_build_module_graph(&mut self) -> Result<()> {
     self.in_finish_make.store(false, Ordering::Release);
     // clean up the entry deps
-    let make_artifact = self.build_module_graph_artifact.take();
-    self
-      .build_module_graph_artifact
-      .replace(finish_build_module_graph(self, make_artifact).await?);
+    let make_artifact = self.build_module_graph_artifact.steal();
+    let make_artifact = finish_build_module_graph(self, make_artifact).await?;
+    self.build_module_graph_artifact = make_artifact.into();
     // sync assets to module graph from module_executor
     if let Some(module_executor) = &mut self.module_executor {
       let mut module_executor = std::mem::take(module_executor);

crates/rspack_core/src/compilation/finish_module_graph/mod.rs

@@ -4,14 +4,17 @@ use super::*;
 use crate::logger::Logger;
 
 pub async fn finish_modules_pass(compilation: &mut Compilation) -> Result<()> {
-  let dependencies_diagnostics_artifact = compilation.dependencies_diagnostics_artifact.clone();
-  let async_modules_artifact = compilation.async_modules_artifact.clone();
+  let mut dependencies_diagnostics_artifact = compilation.dependencies_diagnostics_artifact.steal();
+  let mut async_modules_artifact = compilation.async_modules_artifact.steal();
   let diagnostics = compilation
     .finish_modules_inner(
-      &mut dependencies_diagnostics_artifact.borrow_mut(),
-      &mut async_modules_artifact.borrow_mut(),
+      &mut dependencies_diagnostics_artifact,
+      &mut async_modules_artifact,
     )
-    .await?;
+    .await;
+  compilation.dependencies_diagnostics_artifact = dependencies_diagnostics_artifact.into();
+  compilation.async_modules_artifact = async_modules_artifact.into();
+  let diagnostics = diagnostics?;
   compilation.extend_diagnostics(diagnostics);
 
   Ok(())

crates/rspack_core/src/compilation/finish_modules/mod.rs

@@ -36,7 +36,6 @@ use std::{
   },
 };
 
-use atomic_refcell::AtomicRefCell;
 use dashmap::DashSet;
 use futures::future::BoxFuture;
 use indexmap::IndexMap;
@@ -72,13 +71,13 @@ use crate::{
   CodeGenerationJob, CodeGenerationResult, CodeGenerationResults, CompilationLogger,
   CompilationLogging, CompilerOptions, CompilerPlatform, ConcatenationScope,
   DependenciesDiagnosticsArtifact, DependencyCodeGeneration, DependencyId, DependencyTemplate,
-  DependencyTemplateType, DependencyType, DerefOption, Entry, EntryData, EntryOptions,
-  EntryRuntime, Entrypoint, ExecuteModuleId, ExtendedReferencedExport, Filename, ImportPhase,
-  ImportVarMap, ImportedByDeferModulesArtifact, MemoryGCStorage, ModuleFactory, ModuleGraph,
+  DependencyTemplateType, DependencyType, Entry, EntryData, EntryOptions, EntryRuntime, Entrypoint,
+  ExecuteModuleId, ExtendedReferencedExport, Filename, ImportPhase, ImportVarMap,
+  ImportedByDeferModulesArtifact, MemoryGCStorage, ModuleFactory, ModuleGraph,
   ModuleGraphCacheArtifact, ModuleIdentifier, ModuleIdsArtifact, ModuleStaticCache, PathData,
   ProcessRuntimeRequirementsCacheArtifact, ResolverFactory, RuntimeGlobals, RuntimeKeyMap,
   RuntimeMode, RuntimeModule, RuntimeSpec, RuntimeSpecMap, RuntimeTemplate, SharedPluginDriver,
-  SideEffectsOptimizeArtifact, SourceType, Stats, ValueCacheVersions,
+  SideEffectsOptimizeArtifact, SourceType, Stats, StealCell, ValueCacheVersions,
   compilation::build_module_graph::{
     BuildModuleGraphArtifact, ModuleExecutor, UpdateParam, update_module_graph,
   },
@@ -227,11 +226,11 @@ pub struct Compilation {
   pub runtime_template: RuntimeTemplate,
 
   // artifact for infer_async_modules_plugin
-  pub async_modules_artifact: Arc<AtomicRefCell<AsyncModulesArtifact>>,
+  pub async_modules_artifact: StealCell<AsyncModulesArtifact>,
   // artifact for collect_dependencies_diagnostics
-  pub dependencies_diagnostics_artifact: Arc<AtomicRefCell<DependenciesDiagnosticsArtifact>>,
+  pub dependencies_diagnostics_artifact: StealCell<DependenciesDiagnosticsArtifact>,
   // artifact for side_effects_flag_plugin
-  pub side_effects_optimize_artifact: DerefOption<SideEffectsOptimizeArtifact>,
+  pub side_effects_optimize_artifact: StealCell<SideEffectsOptimizeArtifact>,
   // artifact for module_ids
   pub module_ids_artifact: ModuleIdsArtifact,
   // artifact for named_chunk_ids
@@ -282,7 +281,7 @@ pub struct Compilation {
 
   pub modified_files: ArcPathSet,
   pub removed_files: ArcPathSet,
-  pub build_module_graph_artifact: DerefOption<BuildModuleGraphArtifact>,
+  pub build_module_graph_artifact: StealCell<BuildModuleGraphArtifact>,
   pub input_filesystem: Arc<dyn ReadableFileSystem>,
 
   pub intermediate_filesystem: Arc<dyn IntermediateFileSystem>,
@@ -362,12 +361,10 @@ impl Compilation {
       resolver_factory,
       loader_resolver_factory,
 
-      async_modules_artifact: Arc::new(AtomicRefCell::new(AsyncModulesArtifact::default())),
+      async_modules_artifact: StealCell::new(AsyncModulesArtifact::default()),
       imported_by_defer_modules_artifact: Default::default(),
-      dependencies_diagnostics_artifact: Arc::new(AtomicRefCell::new(
-        DependenciesDiagnosticsArtifact::default(),
-      )),
-      side_effects_optimize_artifact: DerefOption::new(Default::default()),
+      dependencies_diagnostics_artifact: StealCell::new(DependenciesDiagnosticsArtifact::default()),
+      side_effects_optimize_artifact: StealCell::new(Default::default()),
       module_ids_artifact: Default::default(),
       named_chunk_ids_artifact: Default::default(),
       code_generation_results: Default::default(),
@@ -408,7 +405,7 @@ impl Compilation {
       module_executor,
       in_finish_make: AtomicBool::new(false),
 
-      build_module_graph_artifact: DerefOption::new(BuildModuleGraphArtifact::default()),
+      build_module_graph_artifact: StealCell::new(BuildModuleGraphArtifact::default()),
       modified_files,
       removed_files,
       input_filesystem,
@@ -428,26 +425,16 @@ impl Compilation {
     self.compiler_id
   }
 
-  pub fn recover_module_graph_to_new_compilation(&mut self, new_compilation: &mut Compilation) {
-    self
-      .build_module_graph_artifact
-      .get_module_graph_mut()
-      .reset();
-    std::mem::swap(
-      &mut self.build_module_graph_artifact,
-      &mut new_compilation.build_module_graph_artifact,
-    );
-  }
   pub fn swap_build_module_graph_artifact(&mut self, make_artifact: &mut BuildModuleGraphArtifact) {
-    self.build_module_graph_artifact.swap(make_artifact);
+    mem::swap(&mut *self.build_module_graph_artifact, make_artifact);
   }
   pub fn get_module_graph(&self) -> &ModuleGraph {
     self.build_module_graph_artifact.get_module_graph()
   }
 
   // it will return None during make phase since mg is incomplete
   pub fn module_by_identifier(&self, identifier: &ModuleIdentifier) -> Option<&BoxModule> {
-    if self.build_module_graph_artifact.is_none() {
+    if self.build_module_graph_artifact.is_stolen() {
       return None;
     }
     if let Some(module) = self.get_module_graph().module_by_identifier(identifier) {
@@ -661,23 +648,23 @@ impl Compilation {
       self.add_entry(entry, options).await?;
     }
 
-    let make_artifact = self.build_module_graph_artifact.take();
-    self.build_module_graph_artifact.replace(
-      update_module_graph(
-        self,
-        make_artifact,
-        vec![UpdateParam::BuildEntry(
-          self
-            .entries
-            .values()
-            .flat_map(|item| item.all_dependencies())
-            .chain(self.global_entry.all_dependencies())
-            .copied()
-            .collect(),
-        )],
-      )
-      .await?,
-    );
+    let make_artifact = self.build_module_graph_artifact.steal();
+    let make_artifact = update_module_graph(
+      self,
+      make_artifact,
+      vec![UpdateParam::BuildEntry(
+        self
+          .entries
+          .values()
+          .flat_map(|item| item.all_dependencies())
+          .chain(self.global_entry.all_dependencies())
+          .copied()
+          .collect(),
+      )],
+    )
+    .await?;
+    self.build_module_graph_artifact = make_artifact.into();
+
     Ok(())
   }
 
@@ -712,23 +699,23 @@ impl Compilation {
 
     // Recheck entry and clean useless entry
     // This should before finish_modules hook is called, ensure providedExports effects on new added modules
-    let make_artifact = self.build_module_graph_artifact.take();
-    self.build_module_graph_artifact.replace(
-      update_module_graph(
-        self,
-        make_artifact,
-        vec![UpdateParam::BuildEntry(
-          self
-            .entries
-            .values()
-            .flat_map(|item| item.all_dependencies())
-            .chain(self.global_entry.all_dependencies())
-            .copied()
-            .collect(),
-        )],
-      )
-      .await?,
-    );
+    let make_artifact = self.build_module_graph_artifact.steal();
+    let make_artifact = update_module_graph(
+      self,
+      make_artifact,
+      vec![UpdateParam::BuildEntry(
+        self
+          .entries
+          .values()
+          .flat_map(|item| item.all_dependencies())
+          .chain(self.global_entry.all_dependencies())
+          .copied()
+          .collect(),
+      )],
+    )
+    .await?;
+    self.build_module_graph_artifact = make_artifact.into();
+
     Ok(())
   }
 
@@ -1029,19 +1016,18 @@ impl Compilation {
     module_identifiers: IdentifierSet,
     f: impl Fn(Vec<&BoxModule>) -> T,
   ) -> Result<T> {
-    let artifact = self.build_module_graph_artifact.take();
+    let artifact = self.build_module_graph_artifact.steal();
 
     // https://github.com/webpack/webpack/blob/19ca74127f7668aaf60d59f4af8fcaee7924541a/lib/Compilation.js#L2462C21-L2462C25
     self.module_graph_cache_artifact.unfreeze();
 
-    self.build_module_graph_artifact.replace(
-      update_module_graph(
-        self,
-        artifact,
-        vec![UpdateParam::ForceBuildModules(module_identifiers.clone())],
-      )
-      .await?,
-    );
+    let artifact = update_module_graph(
+      self,
+      artifact,
+      vec![UpdateParam::ForceBuildModules(module_identifiers.clone())],
+    )
+    .await?;
+    self.build_module_graph_artifact = artifact.into();
 
     let module_graph = self.get_module_graph();
     Ok(f(module_identifiers

crates/rspack_core/src/compilation/mod.rs

@@ -12,7 +12,7 @@ impl PassExt for OptimizeCodeGenerationPass {
   }
 
   async fn run_pass(&self, compilation: &mut Compilation) -> Result<()> {
-    let mut build_module_graph_artifact = compilation.build_module_graph_artifact.take();
+    let mut build_module_graph_artifact = compilation.build_module_graph_artifact.steal();
     let mut diagnostics = vec![];
     compilation
       .plugin_driver
@@ -27,9 +27,7 @@ impl PassExt for OptimizeCodeGenerationPass {
       .await
       .map_err(|e| e.wrap_err("caused by plugins in Compilation.hooks.optimizeCodeGeneration"))?;
 
-    compilation
-      .build_module_graph_artifact
-      .replace(build_module_graph_artifact);
+    compilation.build_module_graph_artifact = build_module_graph_artifact.into();
     compilation.extend_diagnostics(diagnostics);
 
     Ok(())