Skip to content

chore: bump oxc -> 0.110 #928

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

Open
load1n9 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: bump oxc -> 0.110 #928

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
22 changes: 11 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ lexical = { version = "7.0.5", default-features = false, features = [
] }
num-bigint = "0.4.6"
num-traits = "0.2.19"
oxc-miette = { version = "2.6.0", features = ["fancy"] }
oxc_allocator = "0.105.0"
oxc_ast = "0.105.0"
oxc_diagnostics = "0.105.0"
oxc_ecmascript = "0.105.0"
oxc_parser = "0.105.0"
oxc_regular_expression = "0.105.0"
oxc_semantic = "0.105.0"
oxc_span = "0.105.0"
oxc_syntax = "0.105.0"
oxc-miette = { version = "2.7.0", features = ["fancy"] }
oxc_allocator = "0.110.0"
oxc_ast = "0.110.0"
oxc_diagnostics = "0.110.0"
oxc_ecmascript = "0.110.0"
oxc_parser = "0.110.0"
oxc_regular_expression = "0.110.0"
oxc_semantic = "0.110.0"
oxc_span = "0.110.0"
oxc_syntax = "0.110.0"
rand = "0.9.2"
regex = "1.12.2"
ryu-js = "1.0.2"
soavec = "0.2.0"
soavec_derive = "0.2.0"
sonic-rs = "0.3.17"
unicode-normalization = "0.1.24"
unicode-normalization = "0.1.25"
usdt = { git = "https://github.com/aapoalas/usdt.git", branch = "nova-aarch64-branch" }
wtf8 = "0.1"
xsum = "0.1.6"
Expand Down
2 changes: 1 addition & 1 deletion nova_vm/src/ecmascript/builtins/ecmascript_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ fn expected_arguments_count(params: &FormalParameters) -> usize {
// FormalParameter is true, return count.
// 3. Return count + 1.
for param in params.items.iter() {
if param.pattern.kind.is_assignment_pattern() {
if param.pattern.is_assignment_pattern() {
// FormalParameterList : FormalParameter
// 1. If HasInitializer of FormalParameter is true, return 0.
break;
Expand Down
10 changes: 5 additions & 5 deletions nova_vm/src/ecmascript/syntax_directed_operations/contains.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,19 @@ impl Contains for ast::FormalParameter<'_> {

impl Contains for ast::BindingPattern<'_> {
fn contains(&self, symbol: ContainsSymbol) -> bool {
match &self.kind {
ast::BindingPatternKind::BindingIdentifier(_) => false,
ast::BindingPatternKind::ObjectPattern(e) => {
match self {
ast::BindingPattern::BindingIdentifier(_) => false,
ast::BindingPattern::ObjectPattern(e) => {
e.properties
.iter()
.any(|p| p.key.contains(symbol) || p.value.contains(symbol))
|| e.rest.as_ref().is_some_and(|e| e.argument.contains(symbol))
}
ast::BindingPatternKind::ArrayPattern(e) => e
ast::BindingPattern::ArrayPattern(e) => e
.elements
.iter()
.any(|e| e.as_ref().is_some_and(|e| e.contains(symbol))),
ast::BindingPatternKind::AssignmentPattern(e) => {
ast::BindingPattern::AssignmentPattern(e) => {
e.left.contains(symbol) || e.right.contains(symbol)
}
}
Expand Down
10 changes: 5 additions & 5 deletions nova_vm/src/ecmascript/syntax_directed_operations/function_definitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ pub(crate) trait ContainsExpression {

impl ContainsExpression for ast::BindingPattern<'_> {
fn contains_expression(&self) -> bool {
match &self.kind {
ast::BindingPatternKind::BindingIdentifier(_) => false,
ast::BindingPatternKind::ObjectPattern(pattern) => pattern.contains_expression(),
ast::BindingPatternKind::ArrayPattern(pattern) => pattern.contains_expression(),
ast::BindingPatternKind::AssignmentPattern(_) => true,
match self {
ast::BindingPattern::BindingIdentifier(_) => false,
ast::BindingPattern::ObjectPattern(pattern) => pattern.contains_expression(),
ast::BindingPattern::ArrayPattern(pattern) => pattern.contains_expression(),
ast::BindingPattern::AssignmentPattern(_) => true,
}
}
}
Expand Down
63 changes: 29 additions & 34 deletions nova_vm/src/engine/bytecode/bytecode_compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2989,8 +2989,8 @@ fn simple_array_pattern<'s, I>(
ctx.add_instruction(Instruction::BindingPatternSkip);
continue;
};
match &ele.kind {
ast::BindingPatternKind::BindingIdentifier(identifier) => {
match ele {
ast::BindingPattern::BindingIdentifier(identifier) => {
let identifier_string = ctx.create_string(identifier.name.as_str());
if let Some(stack_slot) = ctx.get_variable_stack_index(identifier.symbol_id()) {
ctx.add_instruction_with_immediate_and_constant(
Expand All @@ -3005,11 +3005,11 @@ fn simple_array_pattern<'s, I>(
)
}
}
ast::BindingPatternKind::ObjectPattern(pattern) => {
ast::BindingPattern::ObjectPattern(pattern) => {
ctx.add_instruction(Instruction::BindingPatternGetValue);
simple_object_pattern(pattern, ctx, has_environment);
}
ast::BindingPatternKind::ArrayPattern(pattern) => {
ast::BindingPattern::ArrayPattern(pattern) => {
ctx.add_instruction(Instruction::BindingPatternGetValue);
simple_array_pattern(
ctx,
Expand All @@ -3019,13 +3019,13 @@ fn simple_array_pattern<'s, I>(
has_environment,
);
}
ast::BindingPatternKind::AssignmentPattern(_) => unreachable!(),
ast::BindingPattern::AssignmentPattern(_) => unreachable!(),
}
}

if let Some(rest) = rest {
match &rest.argument.kind {
ast::BindingPatternKind::BindingIdentifier(identifier) => {
match &rest.argument {
ast::BindingPattern::BindingIdentifier(identifier) => {
if let Some(stack_slot) = ctx.get_variable_stack_index(identifier.symbol_id()) {
ctx.add_instruction_with_immediate(
Instruction::BindingPatternBindRestToIndex,
Expand All @@ -3039,11 +3039,11 @@ fn simple_array_pattern<'s, I>(
);
}
}
ast::BindingPatternKind::ObjectPattern(pattern) => {
ast::BindingPattern::ObjectPattern(pattern) => {
ctx.add_instruction(Instruction::BindingPatternGetRestValue);
simple_object_pattern(pattern, ctx, has_environment);
}
ast::BindingPatternKind::ArrayPattern(pattern) => {
ast::BindingPattern::ArrayPattern(pattern) => {
ctx.add_instruction(Instruction::BindingPatternGetRestValue);
simple_array_pattern(
ctx,
Expand All @@ -3053,7 +3053,7 @@ fn simple_array_pattern<'s, I>(
has_environment,
);
}
ast::BindingPatternKind::AssignmentPattern(_) => unreachable!(),
ast::BindingPattern::AssignmentPattern(_) => unreachable!(),
}
} else {
ctx.add_instruction(Instruction::FinishBindingPattern);
Expand Down Expand Up @@ -3142,12 +3142,9 @@ fn simple_object_pattern<'s>(
if ele.shorthand {
debug_assert!(
matches!(&ele.key, ast::PropertyKey::StaticIdentifier(_))
&& matches!(
&ele.value.kind,
ast::BindingPatternKind::BindingIdentifier(_)
)
&& matches!(&ele.value, ast::BindingPattern::BindingIdentifier(_))
);
let ast::BindingPatternKind::BindingIdentifier(identifier) = &ele.value.kind else {
let ast::BindingPattern::BindingIdentifier(identifier) = &ele.value else {
unreachable!()
};
let identifier = identifier.as_ref();
Expand Down Expand Up @@ -3222,8 +3219,8 @@ fn simple_object_pattern<'s>(
_ => unreachable!(),
};

match &ele.value.kind {
ast::BindingPatternKind::BindingIdentifier(identifier) => {
match &ele.value {
ast::BindingPattern::BindingIdentifier(identifier) => {
let value_identifier_string = ctx.create_string(identifier.name.as_str());
if let Some(stack_slot) = ctx.get_variable_stack_index(identifier.symbol_id()) {
ctx.add_instruction_with_immediate_and_constant(
Expand All @@ -3239,14 +3236,14 @@ fn simple_object_pattern<'s>(
)
}
}
ast::BindingPatternKind::ObjectPattern(pattern) => {
ast::BindingPattern::ObjectPattern(pattern) => {
ctx.add_instruction_with_constant(
Instruction::BindingPatternGetValueNamed,
key_string,
);
simple_object_pattern(pattern, ctx, has_environment);
}
ast::BindingPatternKind::ArrayPattern(pattern) => {
ast::BindingPattern::ArrayPattern(pattern) => {
ctx.add_instruction_with_constant(
Instruction::BindingPatternGetValueNamed,
key_string,
Expand All @@ -3259,14 +3256,14 @@ fn simple_object_pattern<'s>(
has_environment,
);
}
ast::BindingPatternKind::AssignmentPattern(_) => unreachable!(),
ast::BindingPattern::AssignmentPattern(_) => unreachable!(),
}
}
}

if let Some(rest) = &pattern.rest {
match &rest.argument.kind {
ast::BindingPatternKind::BindingIdentifier(identifier) => {
match &rest.argument {
ast::BindingPattern::BindingIdentifier(identifier) => {
if let Some(stack_slot) = ctx.get_variable_stack_index(identifier.symbol_id()) {
ctx.add_instruction_with_immediate(
Instruction::BindingPatternBindRestToIndex,
Expand Down Expand Up @@ -3360,7 +3357,7 @@ fn complex_object_pattern<'s>(
value_on_stack.store(ctx);

if let Some(rest) = &object_pattern.rest {
let ast::BindingPatternKind::BindingIdentifier(identifier) = &rest.argument.kind else {
let ast::BindingPattern::BindingIdentifier(identifier) = &rest.argument else {
unreachable!()
};

Expand Down Expand Up @@ -3391,11 +3388,11 @@ impl<'a, 's, 'gc, 'scope> CompileEvaluation<'a, 's, 'gc, 'scope> for ast::Bindin
type Output = Result<(), ExpressionError>;
/// ### [8.6.2 Runtime Semantics: BindingInitialization](https://tc39.es/ecma262/#sec-runtime-semantics-bindinginitialization)
fn compile(&'s self, ctx: &mut CompileContext<'a, 's, 'gc, 'scope>) -> Self::Output {
match &self.kind {
match self {
// ### BindingIdentifier : Identifier
// ### BindingIdentifier : yield
// ### BindingIdentifier : await
ast::BindingPatternKind::BindingIdentifier(identifier) => {
ast::BindingPattern::BindingIdentifier(identifier) => {
// 1. Let name be the StringValue of Identifier.
// 2. Return ? InitializeBoundName(name, value, environment).
let place = identifier.compile(ctx);
Expand All @@ -3416,22 +3413,22 @@ impl<'a, 's, 'gc, 'scope> CompileEvaluation<'a, 's, 'gc, 'scope> for ast::Bindin
}
}
// ### BindingPattern : ObjectBindingPattern
ast::BindingPatternKind::ObjectPattern(object_binding_pattern) => {
ast::BindingPattern::ObjectPattern(object_binding_pattern) => {
object_binding_pattern.compile(ctx)
}
// ### BindingPattern : ArrayBindingPattern
ast::BindingPatternKind::ArrayPattern(array_binding_pattern) => {
ast::BindingPattern::ArrayPattern(array_binding_pattern) => {
array_binding_pattern.compile(ctx)
}
// ### SingleNameBinding : BindingIdentifier Initializer
// ### BindingElement : BindingPattern Initializer
ast::BindingPatternKind::AssignmentPattern(pattern) => {
match &pattern.left.kind {
ast::BindingPattern::AssignmentPattern(pattern) => {
match &pattern.left {
// ### SingleNameBinding : BindingIdentifier Initializer
//
// * function (a = 1) {}
// * [a = 1]
ast::BindingPatternKind::BindingIdentifier(binding_identifier) => {
ast::BindingPattern::BindingIdentifier(binding_identifier) => {
// 1. Let bindingId be the StringValue of BindingIdentifier.
// 2. Let lhs be ? ResolveBinding(bindingId, environment).
let lhs = binding_identifier.compile(ctx);
Expand Down Expand Up @@ -3550,8 +3547,7 @@ impl<'a, 's, 'gc, 'scope> CompileEvaluation<'a, 's, 'gc, 'scope> for ast::Variab
};
// VariableDeclaration : BindingIdentifier Initializer

let ast::BindingPatternKind::BindingIdentifier(identifier) = &decl.id.kind
else {
let ast::BindingPattern::BindingIdentifier(identifier) = &decl.id else {
// VariableDeclaration : BindingPattern Initializer
// 1. Let rhs be ? Evaluation of Initializer.
// 2. Let rval be ? GetValue(rhs).
Expand Down Expand Up @@ -3598,8 +3594,7 @@ impl<'a, 's, 'gc, 'scope> CompileEvaluation<'a, 's, 'gc, 'scope> for ast::Variab
}
ast::VariableDeclarationKind::Let | ast::VariableDeclarationKind::Const => {
for decl in &self.declarations {
let ast::BindingPatternKind::BindingIdentifier(identifier) = &decl.id.kind
else {
let ast::BindingPattern::BindingIdentifier(identifier) = &decl.id else {
let init = decl.init.as_ref().unwrap();

// LexicalBinding : BindingPattern Initializer
Expand Down
6 changes: 3 additions & 3 deletions nova_vm/src/engine/bytecode/bytecode_compiler/for_in_of_statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ fn for_in_of_body_evaluation<'s, 'gc>(
// 4. Let destructuring be IsDestructuring of lhs.
let destructuring = if let ast::ForStatementLeft::VariableDeclaration(lhs) = lhs {
assert_eq!(lhs.declarations.len(), 1);
lhs.declarations[0].id.kind.is_destructuring_pattern()
lhs.declarations[0].id.is_destructuring_pattern()
} else {
lhs.is_assignment_target_pattern()
};
Expand Down Expand Up @@ -214,8 +214,8 @@ fn for_in_of_body_evaluation<'s, 'gc>(
ast::ForStatementLeft::VariableDeclaration(decl) => {
assert_eq!(decl.declarations.len(), 1);
let declaration = decl.declarations.first().unwrap();
let ast::BindingPatternKind::BindingIdentifier(binding_identifier) =
&declaration.id.kind
let ast::BindingPattern::BindingIdentifier(binding_identifier) =
&declaration.id
else {
unreachable!()
};
Expand Down
4 changes: 2 additions & 2 deletions nova_vm/src/engine/bytecode/bytecode_compiler/function_declaration_instantiation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ pub(crate) fn instantiation<'s>(
let _ = complex_array_pattern(
ctx,
formals.items.iter().map(|param| Some(&param.pattern)),
formals.rest.as_deref(),
formals.rest.as_ref().map(|r| &r.rest),
!has_duplicates,
);
} else {
simple_array_pattern(
ctx,
formals.items.iter().map(|param| Some(&param.pattern)),
formals.rest.as_deref(),
formals.rest.as_ref().map(|r| &r.rest),
formals.items.len(),
!has_duplicates,
);
Expand Down
10 changes: 5 additions & 5 deletions nova_vm/src/engine/bytecode/instructions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,9 +1059,9 @@ fn debug_print_identifier(
}

fn debug_print_binding_pattern(b: &BindingPattern) -> std::string::String {
match &b.kind {
oxc_ast::ast::BindingPatternKind::BindingIdentifier(b) => b.name.to_string(),
oxc_ast::ast::BindingPatternKind::ObjectPattern(b) => {
match b {
oxc_ast::ast::BindingPattern::BindingIdentifier(b) => b.name.to_string(),
oxc_ast::ast::BindingPattern::ObjectPattern(b) => {
let mut prop_strings = b
.properties
.iter()
Expand All @@ -1081,7 +1081,7 @@ fn debug_print_binding_pattern(b: &BindingPattern) -> std::string::String {
}
format!("{{ {} }}", prop_strings.join(", "))
}
oxc_ast::ast::BindingPatternKind::ArrayPattern(b) => {
oxc_ast::ast::BindingPattern::ArrayPattern(b) => {
let mut elem_strings = b
.elements
.iter()
Expand All @@ -1101,7 +1101,7 @@ fn debug_print_binding_pattern(b: &BindingPattern) -> std::string::String {
}
format!("{{ {} }}", elem_strings.join(", "))
}
oxc_ast::ast::BindingPatternKind::AssignmentPattern(b) => {
oxc_ast::ast::BindingPattern::AssignmentPattern(b) => {
format!(
"{} = {}",
debug_print_binding_pattern(&b.left),
Expand Down
Loading