Skip to content

fix(minifier): remove usage of empty spans #8462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Jan 13, 2025
Merged

fix(minifier): remove usage of empty spans #8462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/oxc_minifier/src/ast_passes/peephole_fold_constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use oxc_ecmascript::{
constant_evaluation::{ConstantEvaluation, ConstantValue, ValueType},
side_effects::MayHaveSideEffects,
};
use oxc_span::{GetSpan, SPAN};
use oxc_span::GetSpan;
use oxc_syntax::{
number::NumberBase,
operator::{BinaryOperator, LogicalOperator},
Expand Down Expand Up @@ -192,7 +192,7 @@ impl<'a, 'b> PeepholeFoldConstants {
ctx.ast.move_expression(&mut logical_expr.left),
ctx.ast.move_expression(&mut logical_expr.right),
]);
ctx.ast.expression_sequence(SPAN, expressions)
ctx.ast.expression_sequence(logical_expr.span, expressions)
} else {
// nullish condition => this expression evaluates to the right side.
ctx.ast.move_expression(&mut logical_expr.right)
Expand Down
40 changes: 20 additions & 20 deletions crates/oxc_minifier/src/ast_passes/peephole_minimize_conditions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use oxc_allocator::Vec;
use oxc_ast::{ast::*, NONE};
use oxc_ecmascript::constant_evaluation::{ConstantEvaluation, ValueType};
use oxc_span::{cmp::ContentEq, GetSpan, SPAN};
use oxc_span::{cmp::ContentEq, GetSpan};
use oxc_syntax::es_target::ESTarget;
use oxc_traverse::{traverse_mut_with_ctx, Ancestor, ReusableTraverseCtx, Traverse, TraverseCtx};

Expand Down Expand Up @@ -433,9 +433,9 @@ impl<'a> PeepholeMinimizeConditions {
if let Expression::ConditionalExpression(consequent) = &mut expr.consequent {
if consequent.alternate.content_eq(&expr.alternate) {
return Some(ctx.ast.expression_conditional(
SPAN,
expr.span,
ctx.ast.expression_logical(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
LogicalOperator::And,
ctx.ast.move_expression(&mut consequent.test),
Expand All @@ -450,9 +450,9 @@ impl<'a> PeepholeMinimizeConditions {
if let Expression::ConditionalExpression(alternate) = &mut expr.alternate {
if alternate.consequent.content_eq(&expr.consequent) {
return Some(ctx.ast.expression_conditional(
SPAN,
expr.span,
ctx.ast.expression_logical(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
LogicalOperator::Or,
ctx.ast.move_expression(&mut alternate.test),
Expand All @@ -469,10 +469,10 @@ impl<'a> PeepholeMinimizeConditions {
&& alternate.expressions[1].content_eq(&expr.consequent)
{
return Some(ctx.ast.expression_sequence(
SPAN,
expr.span,
ctx.ast.vec_from_array([
ctx.ast.expression_logical(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
LogicalOperator::Or,
ctx.ast.move_expression(&mut alternate.expressions[0]),
Expand All @@ -489,10 +489,10 @@ impl<'a> PeepholeMinimizeConditions {
&& consequent.expressions[1].content_eq(&expr.alternate)
{
return Some(ctx.ast.expression_sequence(
SPAN,
expr.span,
ctx.ast.vec_from_array([
ctx.ast.expression_logical(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
LogicalOperator::And,
ctx.ast.move_expression(&mut consequent.expressions[0]),
Expand All @@ -509,9 +509,9 @@ impl<'a> PeepholeMinimizeConditions {
&& logical_expr.right.content_eq(&expr.alternate)
{
return Some(ctx.ast.expression_logical(
SPAN,
expr.span,
ctx.ast.expression_logical(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
LogicalOperator::And,
ctx.ast.move_expression(&mut logical_expr.left),
Expand All @@ -528,9 +528,9 @@ impl<'a> PeepholeMinimizeConditions {
&& logical_expr.right.content_eq(&expr.consequent)
{
return Some(ctx.ast.expression_logical(
SPAN,
expr.span,
ctx.ast.expression_logical(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
LogicalOperator::Or,
ctx.ast.move_expression(&mut logical_expr.left),
Expand Down Expand Up @@ -579,9 +579,9 @@ impl<'a> PeepholeMinimizeConditions {
};
let mut args = std::mem::replace(&mut consequent.arguments, ctx.ast.vec());
args[0] = ctx.ast.argument_spread_element(
SPAN,
expr.span,
ctx.ast.expression_conditional(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
consequent_first_arg,
alternate_first_arg,
Expand All @@ -602,7 +602,7 @@ impl<'a> PeepholeMinimizeConditions {
ctx.ast.move_expression(alternate.arguments[0].to_expression_mut());
let mut args = std::mem::replace(&mut consequent.arguments, ctx.ast.vec());
args[0] = Argument::from(ctx.ast.expression_conditional(
SPAN,
expr.test.span(),
ctx.ast.move_expression(&mut expr.test),
consequent_first_arg,
alternate_first_arg,
Expand All @@ -626,9 +626,9 @@ impl<'a> PeepholeMinimizeConditions {
return Some(ctx.ast.expression_logical(
expr.span,
ctx.ast.expression_unary(
SPAN,
ident.span(),
UnaryOperator::LogicalNot,
ctx.ast.expression_unary(SPAN, UnaryOperator::LogicalNot, ident),
ctx.ast.expression_unary(ident.span(), UnaryOperator::LogicalNot, ident),
),
LogicalOperator::Or,
ctx.ast.move_expression(&mut expr.alternate),
Expand Down Expand Up @@ -661,9 +661,9 @@ impl<'a> PeepholeMinimizeConditions {
return Some(ctx.ast.expression_logical(
expr.span,
ctx.ast.expression_unary(
SPAN,
expr.span,
UnaryOperator::LogicalNot,
ctx.ast.expression_unary(SPAN, UnaryOperator::LogicalNot, ident),
ctx.ast.expression_unary(ident.span(), UnaryOperator::LogicalNot, ident),
),
LogicalOperator::And,
ctx.ast.move_expression(&mut expr.consequent),
Expand Down
37 changes: 20 additions & 17 deletions crates/oxc_minifier/src/ast_passes/peephole_remove_dead_code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use oxc_ecmascript::{
constant_evaluation::{ConstantEvaluation, IsLiteralValue},
side_effects::MayHaveSideEffects,
};
use oxc_span::SPAN;
use oxc_span::GetSpan;
use oxc_traverse::{traverse_mut_with_ctx, Ancestor, ReusableTraverseCtx, Traverse, TraverseCtx};

use crate::{ctx::Ctx, keep_var::KeepVar, CompressorPass};
Expand Down Expand Up @@ -225,7 +225,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
ctx.ast.move_statement(&mut if_stmt.consequent)
} else {
if_stmt.alternate.as_mut().map_or_else(
|| ctx.ast.statement_empty(SPAN),
|| ctx.ast.statement_empty(if_stmt.span),
|alternate| ctx.ast.move_statement(alternate),
)
});
Expand Down Expand Up @@ -256,15 +256,15 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
}
}
Some(var_decl.map_or_else(
|| ctx.ast.statement_empty(SPAN),
|| ctx.ast.statement_empty(for_stmt.span),
Statement::VariableDeclaration,
))
}
None => {
let mut keep_var = KeepVar::new(ctx.ast);
keep_var.visit_statement(&for_stmt.body);
Some(keep_var.get_variable_declaration().map_or_else(
|| ctx.ast.statement_empty(SPAN),
|| ctx.ast.statement_empty(for_stmt.span),
Statement::VariableDeclaration,
))
}
Expand Down Expand Up @@ -301,7 +301,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
let mut var = KeepVar::new(ctx.ast);
var.visit_statement(&s.body);
let var_decl = var.get_variable_declaration_statement();
var_decl.unwrap_or(ctx.ast.statement_empty(SPAN)).into()
var_decl.unwrap_or_else(|| ctx.ast.statement_empty(s.span)).into()
}

fn try_fold_expression_stmt(
Expand All @@ -320,7 +320,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {

stmt.expression
.is_literal_value(false)
.then(|| Some(ctx.ast.statement_empty(SPAN)))
.then(|| Some(ctx.ast.statement_empty(stmt.span)))
.unwrap_or_else(|| match &mut stmt.expression {
Expression::ArrayExpression(expr) => Self::try_fold_array_expression(expr, ctx),
Expression::ObjectExpression(object_expr) => {
Expand All @@ -332,7 +332,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
}
let mut expressions = ctx.ast.move_vec(&mut template_lit.expressions);
if expressions.len() == 0 {
return Some(ctx.ast.statement_empty(SPAN));
return Some(ctx.ast.statement_empty(stmt.span));
} else if expressions.len() == 1 {
return Some(
ctx.ast.statement_expression(
Expand All @@ -347,15 +347,15 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
))
}
Expression::FunctionExpression(function_expr) if function_expr.id.is_none() => {
Some(ctx.ast.statement_empty(SPAN))
Some(ctx.ast.statement_empty(stmt.span))
}
Expression::ArrowFunctionExpression(_) => Some(ctx.ast.statement_empty(SPAN)),
Expression::ArrowFunctionExpression(_) => Some(ctx.ast.statement_empty(stmt.span)),
// `typeof x` -> ``
Expression::UnaryExpression(unary_expr)
if unary_expr.operator.is_typeof()
&& unary_expr.argument.is_identifier_reference() =>
{
Some(ctx.ast.statement_empty(SPAN))
Some(ctx.ast.statement_empty(stmt.span))
}
// `typeof x.y` -> `x.y`, `void x` -> `x`
// `+0n` -> `Uncaught TypeError: Cannot convert a BigInt value to a number`
Expand All @@ -382,7 +382,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
if finalizer.body.is_empty() {
Some(ctx.ast.statement_empty(s.span))
} else {
let mut block = ctx.ast.block_statement(SPAN, ctx.ast.vec());
let mut block = ctx.ast.block_statement(finalizer.span, ctx.ast.vec());
std::mem::swap(&mut **finalizer, &mut block);
Some(Statement::BlockStatement(ctx.ast.alloc(block)))
}
Expand Down Expand Up @@ -430,7 +430,7 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
if pending_spread_elements.len() > 0 {
// flush pending spread elements
transformed_elements.push(ctx.ast.expression_array(
SPAN,
el_expr.span(),
pending_spread_elements,
None,
));
Expand All @@ -444,14 +444,14 @@ impl<'a, 'b> PeepholeRemoveDeadCode {

if pending_spread_elements.len() > 0 {
transformed_elements.push(ctx.ast.expression_array(
SPAN,
array_expr.span,
pending_spread_elements,
None,
));
}

if transformed_elements.is_empty() {
return Some(ctx.ast.statement_empty(SPAN));
return Some(ctx.ast.statement_empty(array_expr.span));
} else if transformed_elements.len() == 1 {
return Some(
ctx.ast.statement_expression(array_expr.span, transformed_elements.pop().unwrap()),
Expand Down Expand Up @@ -535,10 +535,13 @@ impl<'a, 'b> PeepholeRemoveDeadCode {
}

if should_keep_as_sequence_expr && new_exprs.len() == 1 {
new_exprs.insert(
0,
ctx.ast.expression_numeric_literal(SPAN, 1.0, None, NumberBase::Decimal),
let number = ctx.ast.expression_numeric_literal(
sequence_expr.span,
1.0,
None,
NumberBase::Decimal,
);
new_exprs.insert(0, number);
}

if new_exprs.len() == 1 {
Expand Down
Loading