Skip to content
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

chore: bump to oxc 0.46 #537

Merged
merged 3 commits into from
Jan 16, 2025
Merged

chore: bump to oxc 0.46 #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aea2430
chore: bump to oxc 0.46
load1n9 Jan 16, 2025
6207670
Fix ScriptIsScript test
aapoalas Jan 16, 2025
0f178fe
chore(test262): Update expectations
aapoalas Jan 16, 2025
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
18 changes: 9 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ fast-float = "0.2.0"
hashbrown = "0.15.2"
num-bigint = "0.4.6"
num-traits = "0.2.19"
oxc_allocator = "0.39.0"
oxc_ast = "0.39.0"
oxc_diagnostics = "0.39.0"
oxc_allocator = "0.46.0"
oxc_ast = "0.46.0"
oxc_diagnostics = "0.46.0"
oxc-miette = { version = "1.0.2", features = ["fancy"] }
oxc_parser = "0.39.0"
oxc_semantic = "0.39.0"
oxc_span = "0.39.0"
oxc_syntax = "0.39.0"
oxc_ecmascript = "0.39.0"
oxc_parser = "0.46.0"
oxc_semantic = "0.46.0"
oxc_span = "0.46.0"
oxc_syntax = "0.46.0"
oxc_ecmascript = "0.46.0"
rand = "0.8.5"
ryu-js = "1.0.1"
sonic-rs = "0.3.16"
sonic-rs = "0.3.17"
unicode-normalization = "0.1.24"
wtf8 = "0.1"
fast_float = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion nova_vm/src/ecmascript/builtins/global_object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ pub fn perform_eval(

// 12. If strictCaller is true, let strictEval be true.
// 13. Else, let strictEval be ScriptIsStrict of script.
let strict_eval = script.is_strict();
let strict_eval = strict_caller || script.has_use_strict_directive();
if strict_caller {
debug_assert!(strict_eval);
}
Expand Down
2 changes: 1 addition & 1 deletion nova_vm/src/ecmascript/scripts_and_modules/script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ pub fn script_evaluation(
mut gc: GcScope<'_, '_>,
) -> JsResult<Value> {
let realm_id = script.realm;
let is_strict_mode = script.ecmascript_code.is_strict();
let is_strict_mode = script.ecmascript_code.source_type.is_strict();
let source_code = script.source_code;
let script = agent.heap.add_script(script);
let realm = agent.get_realm(realm_id);
Expand Down
2 changes: 1 addition & 1 deletion nova_vm/src/engine/bytecode/instructions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ fn debug_print_expression(expr: &oxc_ast::ast::Expression) -> std::string::Strin
oxc_ast::ast::Expression::NullLiteral(_) => "null".to_string(),
oxc_ast::ast::Expression::NumericLiteral(l) => l.value.to_js_string(),
oxc_ast::ast::Expression::BigIntLiteral(l) => l.raw.to_string(),
oxc_ast::ast::Expression::RegExpLiteral(l) => l.raw.to_string(),
oxc_ast::ast::Expression::RegExpLiteral(l) => l.raw.as_ref().unwrap().to_string(),
oxc_ast::ast::Expression::StringLiteral(l) => l.raw.as_ref().unwrap().to_string(),
oxc_ast::ast::Expression::TemplateLiteral(_) => "`...`".to_string(),
_ => "[computed]".to_string(),
Expand Down
10 changes: 0 additions & 10 deletions tests/expectations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15307,30 +15307,22 @@
"language/expressions/dynamic-import/reuse-namespace-object.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/callexpression-arguments.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/callexpression-templateliteral.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-arrow-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-arrow-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-await-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-await-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-import-assertions-trailing-comma-first.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-import-assertions-trailing-comma-second.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js": "CRASH",
Expand Down Expand Up @@ -15378,9 +15370,7 @@
"language/expressions/dynamic-import/syntax/valid/nested-else-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-else-nested-imports.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/nested-else-script-code-valid.js": "CRASH",
"language/expressions/dynamic-import/syntax/valid/nested-function-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-function-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-function-return-import-source-empty-str-is-valid-assign-expr.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-function-return-import-source-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js": "FAIL",
"language/expressions/dynamic-import/syntax/valid/nested-function-script-code-valid.js": "FAIL",
Expand Down
6 changes: 3 additions & 3 deletions tests/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"results": {
"crash": 14290,
"fail": 7293,
"pass": 23659,
"crash": 14359,
"fail": 7214,
"pass": 23669,
"skip": 46,
"timeout": 3,
"unresolved": 0
Expand Down
Loading