Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions crates/oxc_ecmascript/src/constant_evaluation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,25 @@ fn binary_operation_evaluate_value_to<'a>(
if left_ty.is_undetermined() {
return None;
}
return Some(ConstantValue::Boolean(
name == "Object" && left.value_type(ctx).is_object(),
));
if name == "Object" {
if !left_ty.is_object() {
return Some(ConstantValue::Boolean(false));
}
if matches!(
left,
Expression::ArrayExpression(_)
| Expression::RegExpLiteral(_)
| Expression::FunctionExpression(_)
| Expression::ArrowFunctionExpression(_)
| Expression::ClassExpression(_)
) | matches!(left, Expression::ObjectExpression(obj_expr) if obj_expr.properties.is_empty())
{
return Some(ConstantValue::Boolean(true));
}
// NOTE: `{ __proto__: null } instanceof Object` is false
return None;
}
return Some(ConstantValue::Boolean(false));
}
}
None
Expand Down
5 changes: 5 additions & 0 deletions crates/oxc_minifier/src/peephole/fold_constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,11 @@ mod test {
fn test_fold_instance_of_additional() {
fold("(typeof {}) instanceof Object", "!1");
fold("(+{}) instanceof Number", "!1");
fold_same("({ __proto__: null }) instanceof Object");
fold("/foo/ instanceof Object", "!0");
fold("(() => {}) instanceof Object", "!0");
fold("(function(){}) instanceof Object", "!0");
fold("(class{}) instanceof Object", "!0");
}

#[test]
Expand Down
4 changes: 1 addition & 3 deletions tasks/coverage/snapshots/minifier_node_compat.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ commit: 17ac85ca

minifier_node_compat Summary:
AST Parsed : 938/938 (100.00%)
Positive Passed: 929/938 (99.04%)
execution_result: tasks/coverage/ES2015/annex b›__proto__ in object literals›basic support

Positive Passed: 930/938 (99.15%)
execution_result: tasks/coverage/ES2015/built-ins›Proxy›"getOwnPropertyDescriptor" handler invariants

execution_result: tasks/coverage/ES2015/misc›Proxy, internal 'get' calls›HasBinding
Expand Down
Loading