From d21530f3f9e90b464bae73cd1ed34491ac639268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Thu, 23 Jan 2025 16:56:08 +0900 Subject: [PATCH] fix build --- .../src/compress/optimize/mod.rs | 32 +++++++++++++++++-- .../src/compress/pure/mod.rs | 6 ++-- .../src/compress/util/tests.rs | 5 +-- crates/swc_ecma_minifier/src/eval.rs | 1 + crates/swc_ecma_minifier/src/lib.rs | 1 + 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/crates/swc_ecma_minifier/src/compress/optimize/mod.rs b/crates/swc_ecma_minifier/src/compress/optimize/mod.rs index 29493492762e..9f644b93b052 100644 --- a/crates/swc_ecma_minifier/src/compress/optimize/mod.rs +++ b/crates/swc_ecma_minifier/src/compress/optimize/mod.rs @@ -75,8 +75,36 @@ pub(super) fn optimizer<'a>( unresolved_ctxt: SyntaxContext::empty().apply_mark(marks.unresolved_mark), is_unresolved_ref_safe: false, in_strict: options.module, + remaining_depth: 2, }, - ..Ctx::default() + has_const_ann: false, + dont_use_prepend_nor_append: false, + in_bool_ctx: false, + in_asm: false, + is_callee: false, + var_kind: None, + in_try_block: false, + in_cond: false, + is_delete_arg: false, + is_update_arg: false, + is_lhs_of_assign: false, + is_exact_lhs_of_assign: false, + executed_multiple_time: false, + in_bang_arg: false, + in_var_decl_of_for_in_or_of_loop: false, + dont_use_negated_iife: false, + is_exported: false, + top_level: false, + in_fn_like: false, + in_block: false, + in_obj_of_non_computed_member: false, + in_tpl_expr: false, + is_this_aware_callee: false, + is_nested_if_return_merging: false, + dont_invoke_iife: false, + in_with_stmt: false, + in_param: false, + scope: SyntaxContext::default(), }; Optimizer { @@ -99,7 +127,7 @@ pub(super) fn optimizer<'a>( /// Syntactic context. /// /// This should not be modified directly. Use `.with_ctx()` instead. -#[derive(Debug, Default, Clone)] +#[derive(Debug, Clone)] struct Ctx { expr_ctx: ExprCtx, diff --git a/crates/swc_ecma_minifier/src/compress/pure/mod.rs b/crates/swc_ecma_minifier/src/compress/pure/mod.rs index 00a3b8a4bdd2..246c80145baa 100644 --- a/crates/swc_ecma_minifier/src/compress/pure/mod.rs +++ b/crates/swc_ecma_minifier/src/compress/pure/mod.rs @@ -61,6 +61,7 @@ pub(crate) fn pure_optimizer<'a>( unresolved_ctxt: SyntaxContext::empty().apply_mark(marks.unresolved_mark), is_unresolved_ref_safe: false, in_strict: options.module, + remaining_depth: 4, }, ctx: Default::default(), changed: Default::default(), @@ -79,10 +80,7 @@ struct Pure<'a> { impl Parallel for Pure<'_> { fn create(&self) -> Self { - Self { - expr_ctx: self.expr_ctx.clone(), - ..*self - } + Self { ..*self } } fn merge(&mut self, other: Self) { diff --git a/crates/swc_ecma_minifier/src/compress/util/tests.rs b/crates/swc_ecma_minifier/src/compress/util/tests.rs index 78bafe32e8d6..50c628660297 100644 --- a/crates/swc_ecma_minifier/src/compress/util/tests.rs +++ b/crates/swc_ecma_minifier/src/compress/util/tests.rs @@ -49,11 +49,12 @@ fn assert_negate_cost(s: &str, in_bool_ctx: bool, is_ret_val_ignored: bool, expe unresolved_ctxt: SyntaxContext::empty().apply_mark(Mark::new()), is_unresolved_ref_safe: false, in_strict: false, + remaining_depth: 2, }; let real = { let mut real = e.clone(); - negate(&expr_ctx, &mut real, in_bool_ctx, is_ret_val_ignored); + negate(expr_ctx, &mut real, in_bool_ctx, is_ret_val_ignored); real.visit_mut_with(&mut fixer(None)); dump(&real, true) }; @@ -69,7 +70,7 @@ fn assert_negate_cost(s: &str, in_bool_ctx: bool, is_ret_val_ignored: bool, expe info!("Input: {}", input); } - let actual = negate_cost(&expr_ctx, &e, in_bool_ctx, is_ret_val_ignored); + let actual = negate_cost(expr_ctx, &e, in_bool_ctx, is_ret_val_ignored); assert_eq!( actual, expected, diff --git a/crates/swc_ecma_minifier/src/eval.rs b/crates/swc_ecma_minifier/src/eval.rs index 949ec5bc4683..80baf8b93835 100644 --- a/crates/swc_ecma_minifier/src/eval.rs +++ b/crates/swc_ecma_minifier/src/eval.rs @@ -32,6 +32,7 @@ impl Evaluator { unresolved_ctxt: SyntaxContext::empty().apply_mark(marks.unresolved_mark), is_unresolved_ref_safe: false, in_strict: true, + remaining_depth: 3, }, module, diff --git a/crates/swc_ecma_minifier/src/lib.rs b/crates/swc_ecma_minifier/src/lib.rs index f4d3e2002864..4b0cbaa4c6e2 100644 --- a/crates/swc_ecma_minifier/src/lib.rs +++ b/crates/swc_ecma_minifier/src/lib.rs @@ -131,6 +131,7 @@ pub fn optimize( unresolved_ctxt: SyntaxContext::empty().apply_mark(marks.unresolved_mark), is_unresolved_ref_safe: false, in_strict: false, + remaining_depth: 6, })); debug_assert_valid(&n); }