Skip to content

refactor(minifier): side effect detection needs symbols resolution #8715

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 25, 2025
Merged

refactor(minifier): side effect detection needs symbols resolution #8715

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
31 changes: 14 additions & 17 deletions crates/oxc_ecmascript/src/constant_evaluation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ pub use is_literal_value::IsLiteralValue;
pub use value::ConstantValue;
pub use value_type::ValueType;

pub trait ConstantEvaluation<'a> {
fn is_global_reference(&self, ident: &IdentifierReference<'a>) -> bool {
matches!(ident.name.as_str(), "undefined" | "NaN" | "Infinity")
}

pub trait ConstantEvaluation<'a>: MayHaveSideEffects<'a> {
fn resolve_binding(&self, ident: &IdentifierReference<'a>) -> Option<ConstantValue<'a>> {
match ident.name.as_str() {
"undefined" if self.is_global_reference(ident) => Some(ConstantValue::Undefined),
Expand All @@ -36,7 +32,7 @@ pub trait ConstantEvaluation<'a> {
// and there are only a very few cases where we can compute a number value, but there could
// also be side effects. e.g. `void doSomething()` has value NaN, regardless of the behavior
// of `doSomething()`
if value.is_some() && expr.may_have_side_effects() {
if value.is_some() && self.expression_may_have_side_efffects(expr) {
None
} else {
value
Expand All @@ -45,23 +41,23 @@ pub trait ConstantEvaluation<'a> {

fn get_side_free_string_value(&self, expr: &Expression<'a>) -> Option<Cow<'a, str>> {
let value = expr.to_js_string();
if value.is_some() && !expr.may_have_side_effects() {
if value.is_some() && !self.expression_may_have_side_efffects(expr) {
return value;
}
None
}

fn get_side_free_boolean_value(&self, expr: &Expression<'a>) -> Option<bool> {
let value = self.get_boolean_value(expr);
if value.is_some() && !expr.may_have_side_effects() {
if value.is_some() && !self.expression_may_have_side_efffects(expr) {
return value;
}
None
}

fn get_side_free_bigint_value(&self, expr: &Expression<'a>) -> Option<BigInt> {
let value = expr.to_big_int();
if value.is_some() && expr.may_have_side_effects() {
if value.is_some() && self.expression_may_have_side_efffects(expr) {
None
} else {
value
Expand Down Expand Up @@ -205,7 +201,9 @@ pub trait ConstantEvaluation<'a> {
) -> Option<ConstantValue<'a>> {
match operator {
BinaryOperator::Addition => {
if left.may_have_side_effects() || right.may_have_side_effects() {
if self.expression_may_have_side_efffects(left)
|| self.expression_may_have_side_efffects(right)
{
return None;
}
let left_type = ValueType::from(left);
Expand Down Expand Up @@ -321,7 +319,7 @@ pub trait ConstantEvaluation<'a> {
None
}
BinaryOperator::Instanceof => {
if left.may_have_side_effects() {
if self.expression_may_have_side_efffects(left) {
return None;
}
if let Expression::Identifier(right_ident) = right {
Expand Down Expand Up @@ -380,8 +378,9 @@ pub trait ConstantEvaluation<'a> {
};
Some(ConstantValue::String(Cow::Borrowed(s)))
}
UnaryOperator::Void => (expr.argument.is_literal() || !expr.may_have_side_effects())
.then_some(ConstantValue::Undefined),
UnaryOperator::Void => (expr.argument.is_literal()
|| !self.expression_may_have_side_efffects(&expr.argument))
.then_some(ConstantValue::Undefined),
UnaryOperator::LogicalNot => self
.get_side_free_boolean_value(&expr.argument)
.map(|b| !b)
Expand Down Expand Up @@ -424,10 +423,9 @@ pub trait ConstantEvaluation<'a> {
if let Some(ConstantValue::String(s)) = self.eval_expression(&expr.object) {
Some(ConstantValue::Number(s.encode_utf16().count().to_f64().unwrap()))
} else {
if expr.object.may_have_side_effects() {
if self.expression_may_have_side_efffects(&expr.object) {
return None;
}

if let Expression::ArrayExpression(arr) = &expr.object {
Some(ConstantValue::Number(arr.elements.len().to_f64().unwrap()))
} else {
Expand All @@ -448,10 +446,9 @@ pub trait ConstantEvaluation<'a> {
if let Some(ConstantValue::String(s)) = self.eval_expression(&expr.object) {
Some(ConstantValue::Number(s.encode_utf16().count().to_f64().unwrap()))
} else {
if expr.object.may_have_side_effects() {
if self.expression_may_have_side_efffects(&expr.object) {
return None;
}

if let Expression::ArrayExpression(arr) = &expr.object {
Some(ConstantValue::Number(arr.elements.len().to_f64().unwrap()))
} else {
Expand Down
Loading
Loading