Fix reassigned()

kdy1 · Oct 5, 2022 · a230ee0 · a230ee0 · github-actions · Oct 5, 2022
1 parent fc5ff05
commit a230ee0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/crates/swc_ecma_minifier/src/analyzer/mod.rs b/crates/swc_ecma_minifier/src/analyzer/mod.rs
@@ -153,11 +153,7 @@ impl VarUsageInfo {
     pub fn reassigned(&self) -> bool {
         self.reassigned_with_assignment
             || self.reassigned_with_var_decl
-            || (u32::from(self.var_initialized)
-                + u32::from(self.declared_as_catch_param)
-                + u32::from(self.declared_as_fn_param)
-                + self.assign_count)
-                > 1
+            || (self.declared_count + self.assign_count) > 1
     }
 }
 

diff --git a/crates/swc_ecma_minifier/src/analyzer/storage/normal.rs b/crates/swc_ecma_minifier/src/analyzer/storage/normal.rs
@@ -288,6 +288,7 @@ impl ProgramData {
 impl VarDataLike for VarUsageInfo {
     fn mark_declared_as_fn_param(&mut self) {
         self.declared_as_fn_param = true;
+        self.declared_count += 1;
     }
 
     fn mark_declared_as_fn_expr(&mut self) {
Benchmark suite	Current: `a230ee0`	Previous: `e3b55e4`	Ratio
`es/full/minify/libraries/antd`	`2103067983` ns/iter (`± 125555566`)	`1848783993` ns/iter (`± 15244273`)	`1.14`
`es/full/minify/libraries/d3`	`417690711` ns/iter (`± 12258894`)	`348914662` ns/iter (`± 4711514`)	`1.20`
`es/full/minify/libraries/echarts`	`1603015388` ns/iter (`± 145310894`)	`1409619321` ns/iter (`± 17841593`)	`1.14`
`es/full/minify/libraries/jquery`	`108211465` ns/iter (`± 2398913`)	`85105490` ns/iter (`± 1707053`)	`1.27`
`es/full/minify/libraries/lodash`	`137761844` ns/iter (`± 14408877`)	`103383122` ns/iter (`± 4032407`)	`1.33`
`es/full/minify/libraries/moment`	`61482739` ns/iter (`± 7013876`)	`49253451` ns/iter (`± 4226823`)	`1.25`
`es/full/minify/libraries/react`	`23799682` ns/iter (`± 4968026`)	`18317341` ns/iter (`± 279402`)	`1.30`
`es/full/minify/libraries/terser`	`322266088` ns/iter (`± 5129145`)	`265951843` ns/iter (`± 4946910`)	`1.21`
`es/full/minify/libraries/three`	`541387349` ns/iter (`± 11492133`)	`479946685` ns/iter (`± 4619520`)	`1.13`
`es/full/minify/libraries/typescript`	`3525782091` ns/iter (`± 157244070`)	`3177674496` ns/iter (`± 19655885`)	`1.11`
`es/full/minify/libraries/victory`	`821025383` ns/iter (`± 91586551`)	`737614815` ns/iter (`± 12022003`)	`1.11`
`es/full/minify/libraries/vue`	`163756116` ns/iter (`± 7719657`)	`125914925` ns/iter (`± 3064974`)	`1.30`
`es/full/codegen/es3`	`34776` ns/iter (`± 5333`)	`33979` ns/iter (`± 552`)	`1.02`
`es/full/codegen/es5`	`34454` ns/iter (`± 3203`)	`33979` ns/iter (`± 854`)	`1.01`
`es/full/codegen/es2015`	`34475` ns/iter (`± 4309`)	`33977` ns/iter (`± 806`)	`1.01`
`es/full/codegen/es2016`	`34232` ns/iter (`± 5406`)	`34013` ns/iter (`± 1039`)	`1.01`
`es/full/codegen/es2017`	`34841` ns/iter (`± 4760`)	`33942` ns/iter (`± 1237`)	`1.03`
`es/full/codegen/es2018`	`35078` ns/iter (`± 3577`)	`33967` ns/iter (`± 702`)	`1.03`
`es/full/codegen/es2019`	`34777` ns/iter (`± 5171`)	`33959` ns/iter (`± 767`)	`1.02`
`es/full/codegen/es2020`	`34472` ns/iter (`± 1334`)	`33923` ns/iter (`± 919`)	`1.02`
`es/full/all/es3`	`235129991` ns/iter (`± 29446860`)	`190157744` ns/iter (`± 4396922`)	`1.24`
`es/full/all/es5`	`222205084` ns/iter (`± 27281891`)	`180107404` ns/iter (`± 3709173`)	`1.23`
`es/full/all/es2015`	`167634831` ns/iter (`± 18326884`)	`144640874` ns/iter (`± 3636598`)	`1.16`
`es/full/all/es2016`	`168027614` ns/iter (`± 49528947`)	`145429986` ns/iter (`± 4319671`)	`1.16`
`es/full/all/es2017`	`166562843` ns/iter (`± 25450813`)	`143889974` ns/iter (`± 7310448`)	`1.16`
`es/full/all/es2018`	`165056736` ns/iter (`± 24996499`)	`145935584` ns/iter (`± 62376541`)	`1.13`
`es/full/all/es2019`	`167577401` ns/iter (`± 26073948`)	`142347336` ns/iter (`± 6965351`)	`1.18`
`es/full/all/es2020`	`161484046` ns/iter (`± 25452005`)	`156921972` ns/iter (`± 13737213`)	`1.03`
`es/full/parser`	`772087` ns/iter (`± 136099`)	`724747` ns/iter (`± 27936`)	`1.07`
`es/full/base/fixer`	`27431` ns/iter (`± 1673`)	`26376` ns/iter (`± 721`)	`1.04`
`es/full/base/resolver_and_hygiene`	`100376` ns/iter (`± 23422`)	`94636` ns/iter (`± 2728`)	`1.06`
`serialization of ast node`	`233` ns/iter (`± 9`)	`232` ns/iter (`± 15`)	`1.00`
`serialization of serde`	`235` ns/iter (`± 6`)	`231` ns/iter (`± 4`)	`1.02`