dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-25 12:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(minifier): do not fold if statement block with lexical declaration (#7519)

Browse source
This commit is contained in:
Boshen 2024-11-28 10:37:41 +00:00
parent 625a5bad02
commit 896ff860f9
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/oxc_allocator/src/vec.rs
View file

@ -223,12 +223,11 @@ impl<'alloc, T> ops::Index<usize> for Vec<'alloc, T> {
} }
} }
// Unused right now. impl<'alloc, T> ops::IndexMut<usize> for Vec<'alloc, T> {
// impl<'alloc, T> ops::IndexMut<usize> for Vec<'alloc, T> { fn index_mut(&mut self, index: usize) -> &mut Self::Output {
// fn index_mut(&mut self, index: usize) -> &mut Self::Output { self.0.index_mut(index)
// self.0.index_mut(index) }
// } }
// }
#[cfg(any(feature = "serialize", test))] #[cfg(any(feature = "serialize", test))]
impl<'alloc, T> Serialize for Vec<'alloc, T> impl<'alloc, T> Serialize for Vec<'alloc, T>

21
crates/oxc_minifier/src/ast_passes/peephole_minimize_conditions.rs
View file

@ -68,15 +68,19 @@ impl<'a> PeepholeMinimizeConditions {
/// Duplicate logic to DCE part. /// Duplicate logic to DCE part.
fn try_fold_if_block_one(&mut self, if_stmt: &mut IfStatement<'a>, ctx: &mut TraverseCtx<'a>) { fn try_fold_if_block_one(&mut self, if_stmt: &mut IfStatement<'a>, ctx: &mut TraverseCtx<'a>) {
if let Statement::BlockStatement(block) = &mut if_stmt.consequent { if let Statement::BlockStatement(block) = &mut if_stmt.consequent {
if block.body.len() == 1 { if block.body.len() == 1
&& !matches!(&block.body[0], Statement::VariableDeclaration(decl) if !decl.kind.is_var())
{
self.changed = true; self.changed = true;
if_stmt.consequent = ctx.ast.move_statement(block.body.first_mut().unwrap()); if_stmt.consequent = ctx.ast.move_statement(&mut block.body[0]);
} }
} }
if let Some(Statement::BlockStatement(block)) = &mut if_stmt.alternate { if let Some(Statement::BlockStatement(block)) = &mut if_stmt.alternate {
if block.body.len() == 1 { if block.body.len() == 1
&& !matches!(&block.body[0], Statement::VariableDeclaration(decl) if !decl.kind.is_var())
{
self.changed = true; self.changed = true;
if_stmt.alternate = Some(ctx.ast.move_statement(block.body.first_mut().unwrap())); if_stmt.alternate = Some(ctx.ast.move_statement(&mut block.body[0]));
} }
} }
} }
@ -241,6 +245,15 @@ mod test {
fold_same("function f(){foo()}"); fold_same("function f(){foo()}");
fold_same("switch(x){case y: foo()}"); fold_same("switch(x){case y: foo()}");
fold_same("try{foo()}catch(ex){bar()}finally{baz()}"); fold_same("try{foo()}catch(ex){bar()}finally{baz()}");
// Dot not fold `let` and `const`.
// Lexical declaration cannot appear in a single-statement context.
fold_same("if (foo) { const bar = 1 } else { const baz = 1 }");
fold_same("if (foo) { let bar = 1 } else { let baz = 1 }");
fold(
"if (foo) { var bar = 1 } else { var baz = 1 }",
"if (foo) var bar = 1; else var baz = 1;",
);
} }
/** Try to minimize returns */ /** Try to minimize returns */