chore(es/parser): use stacker in utils

bvanjoi · bvanjoi · commit 995b7401e2cd · 2025-05-22T10:26:41.000+08:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -308,7 +308,7 @@ jobs:
       - name: Run cargo test (transforms with stacker)
         if: matrix.settings.crate == 'swc_ecma_transforms'
         run: |
-          cargo test -p ${{ matrix.settings.crate }} --all-features --features swc_ecma_utils/stacker
+          cargo test -p ${{ matrix.settings.crate }} --all-features --features swc_common/stacker
 
       - name: Run cargo test (concurrent)
         if: runner.os == 'Linux' && matrix.settings.crate != 'swc_ecma_minifier'
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/swc_common/Cargo.toml b/crates/swc_common/Cargo.toml
@@ -68,6 +68,8 @@ swc_atoms            = { version = "5.0.0", path = "../swc_atoms" }
 swc_eq_ignore_macros = { version = "1.0.0", path = "../swc_eq_ignore_macros" }
 swc_visit            = { version = "2.0.0", path = "../swc_visit" }
 
+[target.'cfg(not(any(target_arch = "wasm32", target_arch = "arm")))'.dependencies]
+stacker = { version = "0.1.15", optional = true }
 
 [dev-dependencies]
 codspeed-criterion-compat = { workspace = true }
diff --git a/crates/swc_common/src/lib.rs b/crates/swc_common/src/lib.rs
@@ -67,6 +67,7 @@ pub mod private;
 mod rustc_data_structures;
 pub mod serializer;
 pub mod source_map;
+pub mod stack_size;
 pub mod sync;
 mod syntax_pos;
 pub mod util;
diff --git a/crates/swc_common/src/stack_size.rs b/crates/swc_common/src/stack_size.rs
diff --git a/crates/swc_core/Cargo.toml b/crates/swc_core/Cargo.toml
@@ -196,7 +196,7 @@ ecma_plugin_transform = [
 ]
 
 # Use `stacker` to avoid stack overflow.
-stacker = ["swc_ecma_parser/stacker", "swc_ecma_utils/stacker"]
+stacker = ["swc_common/stacker"]
 
 
 typescript = ["swc_typescript"]
diff --git a/crates/swc_ecma_lexer/Cargo.toml b/crates/swc_ecma_lexer/Cargo.toml
@@ -19,7 +19,7 @@ bench = false
 [features]
 # Used for debugging
 debug         = ["tracing-spans"]
-default       = ["typescript", "stacker"]
+default       = ["typescript", "swc_common/stacker"]
 tracing-spans = []
 typescript    = []
 verify        = ["swc_ecma_visit"]
@@ -44,9 +44,6 @@ swc_common            = { version = "11.0.0", path = "../swc_common" }
 swc_ecma_ast          = { version = "11.0.0", path = "../swc_ecma_ast" }
 swc_ecma_visit        = { version = "11.0.0", path = "../swc_ecma_visit", optional = true }
 
-[target.'cfg(not(any(target_arch = "wasm32", target_arch = "arm")))'.dependencies]
-stacker = { version = "0.1.15", optional = true }
-
 [dev-dependencies]
 criterion         = { workspace = true }
 pretty_assertions = { workspace = true }
diff --git a/crates/swc_ecma_lexer/src/common/parser/stmt.rs b/crates/swc_ecma_lexer/src/common/parser/stmt.rs
@@ -623,7 +623,7 @@ fn parse_if_stmt<'a, P: Parser<'a>>(p: &mut P) -> PResult<IfStmt> {
 
     let cons = {
         // Prevent stack overflow
-        crate::maybe_grow(256 * 1024, 1024 * 1024, || {
+        swc_common::stack_size::maybe_grow(256 * 1024, 1024 * 1024, || {
             // Annex B
             if !p.ctx().contains(Context::Strict) && p.input_mut().is(&P::Token::FUNCTION) {
                 // TODO: report error?
diff --git a/crates/swc_ecma_lexer/src/lib.rs b/crates/swc_ecma_lexer/src/lib.rs
@@ -367,27 +367,6 @@ macro_rules! tok {
     };
 }
 
-#[inline(always)]
-#[cfg(any(
-    target_arch = "wasm32",
-    target_arch = "arm",
-    not(feature = "stacker"),
-    // miri does not work with stacker
-    miri
-))]
-fn maybe_grow<R, F: FnOnce() -> R>(_red_zone: usize, _stack_size: usize, callback: F) -> R {
-    callback()
-}
-
-#[inline(always)]
-#[cfg(all(
-    not(any(target_arch = "wasm32", target_arch = "arm", miri)),
-    feature = "stacker"
-))]
-fn maybe_grow<R, F: FnOnce() -> R>(red_zone: usize, stack_size: usize, callback: F) -> R {
-    stacker::maybe_grow(red_zone, stack_size, callback)
-}
-
 pub fn lexer(input: Lexer) -> PResult<Vec<token::TokenAndSpan>> {
     let capturing = input::Capturing::new(input);
     let mut parser = parser::Parser::new_from(capturing);
diff --git a/crates/swc_ecma_parser/Cargo.toml b/crates/swc_ecma_parser/Cargo.toml
@@ -19,7 +19,7 @@ bench = false
 [features]
 # Used for debugging
 debug         = ["tracing-spans"]
-default       = ["typescript", "stacker"]
+default       = ["typescript", "swc_ecma_lexer/default"]
 tracing-spans = []
 typescript    = []
 verify        = ["swc_ecma_visit", "swc_ecma_lexer/verify"]
@@ -42,12 +42,9 @@ phf                   = { workspace = true, features = ["macros"] }
 swc_atoms             = { version = "5.0.0", path = "../swc_atoms" }
 swc_common            = { version = "11.0.0", path = "../swc_common" }
 swc_ecma_ast          = { version = "11.0.0", path = "../swc_ecma_ast" }
-swc_ecma_lexer        = { version = "14.0.0", path = "../swc_ecma_lexer" }
+swc_ecma_lexer        = { version = "14.0.0", path = "../swc_ecma_lexer", default-features = false }
 swc_ecma_visit        = { version = "11.0.0", path = "../swc_ecma_visit", optional = true }
 
-[target.'cfg(not(any(target_arch = "wasm32", target_arch = "arm")))'.dependencies]
-stacker = { version = "0.1.15", optional = true }
-
 [dev-dependencies]
 criterion         = { workspace = true }
 pretty_assertions = { workspace = true }
diff --git a/crates/swc_ecma_transforms/Cargo.toml b/crates/swc_ecma_transforms/Cargo.toml
@@ -29,7 +29,7 @@ multi-module-decorator = ["swc_ecma_transforms_proposal/multi-module"]
 optimization = ["swc_ecma_transforms_optimization"]
 proposal = ["swc_ecma_transforms_proposal"]
 react = ["swc_ecma_transforms_react"]
-stacker = ["swc_ecma_utils/stacker"]
+stacker = ["swc_common/stacker"]
 typescript = ["swc_ecma_transforms_typescript"]
 
 [dependencies]
diff --git a/crates/swc_ecma_transforms_base/src/fixer.rs b/crates/swc_ecma_transforms_base/src/fixer.rs
@@ -2,9 +2,10 @@ use std::{hash::BuildHasherDefault, mem, ops::RangeFull};
 
 use indexmap::IndexMap;
 use rustc_hash::FxHasher;
-use swc_common::{comments::Comments, util::take::Take, Span, Spanned, DUMMY_SP};
+use swc_common::{
+    comments::Comments, stack_size::maybe_grow_default, util::take::Take, Span, Spanned, DUMMY_SP,
+};
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith};
 
 /// Fixes ast nodes before printing so semantics are preserved.
diff --git a/crates/swc_ecma_transforms_base/src/hygiene/mod.rs b/crates/swc_ecma_transforms_base/src/hygiene/mod.rs
@@ -1,6 +1,5 @@
-use swc_common::Mark;
+use swc_common::{stack_size::maybe_grow_default, Mark};
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith};
 
 pub use crate::rename::rename;
diff --git a/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs b/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs
@@ -1,6 +1,5 @@
-use swc_common::Mark;
+use swc_common::{stack_size::maybe_grow_default, Mark};
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_type, Visit, VisitWith};
 
 use self::scope::{Scope, ScopeKind};
diff --git a/crates/swc_ecma_transforms_base/src/rename/collector.rs b/crates/swc_ecma_transforms_base/src/rename/collector.rs
@@ -2,9 +2,9 @@ use std::hash::Hash;
 
 use rustc_hash::FxHashSet;
 use swc_atoms::Atom;
-use swc_common::{Mark, SyntaxContext};
+use swc_common::{stack_size::maybe_grow_default, Mark, SyntaxContext};
 use swc_ecma_ast::*;
-use swc_ecma_utils::{ident::IdentLike, stack_size::maybe_grow_default};
+use swc_ecma_utils::ident::IdentLike;
 use swc_ecma_visit::{noop_visit_type, visit_obj_and_computed, Visit, VisitWith};
 
 struct IdCollector {
diff --git a/crates/swc_ecma_transforms_base/src/rename/eval.rs b/crates/swc_ecma_transforms_base/src/rename/eval.rs
@@ -1,5 +1,5 @@
+use swc_common::stack_size::maybe_grow_default;
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_type, visit_obj_and_computed, Visit, VisitWith};
 
 pub fn contains_eval<N>(node: &N, include_with: bool) -> bool
diff --git a/crates/swc_ecma_transforms_base/src/rename/mod.rs b/crates/swc_ecma_transforms_base/src/rename/mod.rs
@@ -5,8 +5,8 @@ use std::{borrow::Cow, collections::hash_map::Entry};
 use collector::{collect, Collector};
 use rustc_hash::{FxHashMap, FxHashSet};
 use swc_atoms::Atom;
+use swc_common::stack_size::maybe_grow_default;
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{
     noop_visit_mut_type, visit_mut_pass, Fold, VisitMut, VisitMutWith, VisitWith,
 };
diff --git a/crates/swc_ecma_transforms_base/src/rename/ops.rs b/crates/swc_ecma_transforms_base/src/rename/ops.rs
@@ -1,10 +1,11 @@
 use rustc_hash::FxHashMap;
 use swc_common::{
+    stack_size::maybe_grow_default,
     util::{move_map::MoveMap, take::Take},
     Spanned, SyntaxContext, DUMMY_SP,
 };
 use swc_ecma_ast::*;
-use swc_ecma_utils::{ident::IdentLike, stack_size::maybe_grow_default};
+use swc_ecma_utils::ident::IdentLike;
 use swc_ecma_visit::{noop_visit_mut_type, VisitMut, VisitMutWith};
 
 use super::RenameMap;
diff --git a/crates/swc_ecma_transforms_base/src/resolver/mod.rs b/crates/swc_ecma_transforms_base/src/resolver/mod.rs
@@ -1,8 +1,8 @@
 use rustc_hash::{FxHashMap, FxHashSet};
 use swc_atoms::Atom;
-use swc_common::{Mark, SyntaxContext};
+use swc_common::{stack_size::maybe_grow_default, Mark, SyntaxContext};
 use swc_ecma_ast::*;
-use swc_ecma_utils::{find_pat_ids, stack_size::maybe_grow_default};
+use swc_ecma_utils::find_pat_ids;
 use swc_ecma_visit::{
     noop_visit_mut_type, visit_mut_obj_and_computed, visit_mut_pass, VisitMut, VisitMutWith,
 };
diff --git a/crates/swc_ecma_transforms_proposal/src/decorator_impl.rs b/crates/swc_ecma_transforms_proposal/src/decorator_impl.rs
@@ -2,13 +2,15 @@ use std::{collections::VecDeque, iter::once, mem::take};
 
 use rustc_hash::FxHashMap;
 use swc_atoms::Atom;
-use swc_common::{util::take::Take, Mark, Spanned, SyntaxContext, DUMMY_SP};
+use swc_common::{
+    stack_size::maybe_grow_default, util::take::Take, Mark, Spanned, SyntaxContext, DUMMY_SP,
+};
 use swc_ecma_ast::*;
 use swc_ecma_transforms_base::{helper, helper_expr};
 use swc_ecma_utils::{
     alias_ident_for, constructor::inject_after_super, default_constructor_with_span,
     is_maybe_branch_directive, private_ident, prop_name_to_expr_value, quote_ident, replace_ident,
-    stack_size::maybe_grow_default, ExprFactory, IdentRenamer,
+    ExprFactory, IdentRenamer,
 };
 use swc_ecma_visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith};
 
diff --git a/crates/swc_ecma_transforms_proposal/src/explicit_resource_management.rs b/crates/swc_ecma_transforms_proposal/src/explicit_resource_management.rs
@@ -1,10 +1,7 @@
-use swc_common::{util::take::Take, DUMMY_SP};
+use swc_common::{stack_size::maybe_grow_default, util::take::Take, DUMMY_SP};
 use swc_ecma_ast::*;
 use swc_ecma_transforms_base::helper;
-use swc_ecma_utils::{
-    private_ident, quote_ident, stack_size::maybe_grow_default, ExprFactory, ModuleItemLike,
-    StmtLike,
-};
+use swc_ecma_utils::{private_ident, quote_ident, ExprFactory, ModuleItemLike, StmtLike};
 use swc_ecma_visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith};
 
 pub fn explicit_resource_management() -> impl Pass {
diff --git a/crates/swc_ecma_transforms_typescript/src/strip_import_export.rs b/crates/swc_ecma_transforms_typescript/src/strip_import_export.rs
@@ -1,6 +1,6 @@
 use rustc_hash::{FxHashMap, FxHashSet};
+use swc_common::stack_size::maybe_grow_default;
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_type, Visit, VisitMut, VisitMutWith, VisitWith};
 
 use crate::{strip_type::IsConcrete, ImportsNotUsedAsValues};
diff --git a/crates/swc_ecma_transforms_typescript/src/strip_type.rs b/crates/swc_ecma_transforms_typescript/src/strip_type.rs
@@ -1,6 +1,5 @@
-use swc_common::util::take::Take;
+use swc_common::{stack_size::maybe_grow_default, util::take::Take};
 use swc_ecma_ast::*;
-use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_mut_type, VisitMut, VisitMutWith};
 
 use crate::type_to_none;
diff --git a/crates/swc_ecma_transforms_typescript/src/transform.rs b/crates/swc_ecma_transforms_typescript/src/transform.rs
@@ -3,14 +3,14 @@ use std::{iter, mem};
 use rustc_hash::{FxHashMap, FxHashSet};
 use swc_atoms::Atom;
 use swc_common::{
-    errors::HANDLER, source_map::PURE_SP, util::take::Take, Mark, Span, Spanned, SyntaxContext,
-    DUMMY_SP,
+    errors::HANDLER, source_map::PURE_SP, stack_size::maybe_grow_default, util::take::Take, Mark,
+    Span, Spanned, SyntaxContext, DUMMY_SP,
 };
 use swc_ecma_ast::*;
 use swc_ecma_utils::{
     alias_ident_for, constructor::inject_after_super, find_pat_ids, ident::IdentLike, is_literal,
-    member_expr, private_ident, quote_ident, quote_str, stack_size::maybe_grow_default,
-    ExprFactory, QueryRef, RefRewriter, StmtLikeInjector,
+    member_expr, private_ident, quote_ident, quote_str, ExprFactory, QueryRef, RefRewriter,
+    StmtLikeInjector,
 };
 use swc_ecma_visit::{
     noop_visit_mut_type, noop_visit_type, visit_mut_pass, Visit, VisitMut, VisitMutWith, VisitWith,
diff --git a/crates/swc_ecma_utils/Cargo.toml b/crates/swc_ecma_utils/Cargo.toml
@@ -36,8 +36,6 @@ swc_common     = { version = "11.0.0", path = "../swc_common" }
 swc_ecma_ast   = { version = "11.0.0", path = "../swc_ecma_ast" }
 swc_ecma_visit = { version = "11.0.0", path = "../swc_ecma_visit" }
 
-[target.'cfg(not(any(target_arch = "wasm32", target_arch = "arm")))'.dependencies]
-stacker = { version = "0.1.15", optional = true }
 
 [dev-dependencies]
 par-core        = { workspace = true, features = ["chili"] }
diff --git a/crates/swc_ecma_utils/src/lib.rs b/crates/swc_ecma_utils/src/lib.rs
@@ -54,7 +54,6 @@ pub mod var;
 
 mod node_ignore_span;
 pub mod number;
-pub mod stack_size;
 pub use node_ignore_span::NodeIgnoringSpan;
 
 // TODO: remove

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ ecma_plugin_transform = [`
`196`	`196`	`]`
`197`	`197`
`198`	`198`	# Use `stacker` to avoid stack overflow.
`199`		`-stacker = ["swc_ecma_parser/stacker", "swc_ecma_utils/stacker"]`
	`199`	`+stacker = ["swc_common/stacker"]`
`200`	`200`
`201`	`201`
`202`	`202`	`typescript = ["swc_typescript"]`