ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-23 18:21:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 GC 阈值与常量折叠引发的两族测试断言失效

Browse Source
This commit is contained in:
彭俊皓
2026-10-13 03:21:50 +00:00
parent bd5ea29203
commit 07d72c00de
4 changed files with 71 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+21 -21
View File
@@ -1160,7 +1160,7 @@ dependencies = [
[[package]]
name = "oxide_builtins"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"chrono",
"fast-float",
@@ -1185,7 +1185,7 @@ dependencies = [
[[package]]
name = "oxide_bytecode"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"num-bigint",
"oxide_log",
@@ -1193,7 +1193,7 @@ dependencies = [
[[package]]
name = "oxide_cfg"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_emit",
@@ -1204,7 +1204,7 @@ dependencies = [
[[package]]
name = "oxide_cli"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"ansi_term",
"bumpalo",
@@ -1228,7 +1228,7 @@ dependencies = [
[[package]]
name = "oxide_code_cache"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"lru",
"oxide_bytecode",
@@ -1237,7 +1237,7 @@ dependencies = [
[[package]]
name = "oxide_compiler"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1258,7 +1258,7 @@ dependencies = [
[[package]]
name = "oxide_dce"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1272,7 +1272,7 @@ dependencies = [
[[package]]
name = "oxide_emit"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"num-bigint",
"oxc_allocator",
@@ -1288,7 +1288,7 @@ dependencies = [
[[package]]
name = "oxide_engine"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_compiler",
@@ -1300,7 +1300,7 @@ dependencies = [
[[package]]
name = "oxide_fold"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"num-bigint",
"oxide_bytecode",
@@ -1312,7 +1312,7 @@ dependencies = [
[[package]]
name = "oxide_ir"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_log",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]]
name = "oxide_kernel"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"bumpalo",
"dashmap",
@@ -1335,7 +1335,7 @@ dependencies = [
[[package]]
name = "oxide_liveness"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1347,7 +1347,7 @@ dependencies = [
[[package]]
name = "oxide_log"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"tracing",
"tracing-appender",
@@ -1356,11 +1356,11 @@ dependencies = [
[[package]]
name = "oxide_net"
version = "0.18.2"
version = "0.18.3"
[[package]]
name = "oxide_parser"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxc_allocator",
"oxc_ast",
@@ -1375,7 +1375,7 @@ dependencies = [
[[package]]
name = "oxide_regalloc"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1391,7 +1391,7 @@ dependencies = [
[[package]]
name = "oxide_runtime_api"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"num-bigint",
"num-traits",
@@ -1404,7 +1404,7 @@ dependencies = [
[[package]]
name = "oxide_test262"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"oxide_bytecode",
"oxide_compiler",
@@ -1424,7 +1424,7 @@ dependencies = [
[[package]]
name = "oxide_types"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"bumpalo",
"dashmap",
@@ -1437,7 +1437,7 @@ dependencies = [
[[package]]
name = "oxide_vm"
version = "0.18.2"
version = "0.18.3"
dependencies = [
"bumpalo",
"chrono",
Cargo.toml
+1 -1
View File
@@ -25,7 +25,7 @@ members = [
]
[workspace.package]
version = "0.18.2"
version = "0.18.3"
edition = "2021"
license = "MIT"
rust-version = "1.80"
crates/oxide_compiler/tests/compile_expr_tests.rs
+41 -25
View File
@@ -23,7 +23,8 @@ fn compile_source_err(source: &str) -> String {
#[test]
fn compile_simple_expr() {
let module = compile_source("1 + 2");
// 变量操作数避免常量折叠：折叠后 1 + 2 只剩单条 LOAD_CONST，无二元运算指令。
let module = compile_source("var a = 1; var b = 2; a + b");
assert!(!module.bytecode.is_empty());
assert!(module.bytecode.len() >= 4);
@@ -75,7 +76,8 @@ fn compile_dedups_identical_string_constants() {
#[test]
fn compile_negation() {
let module = compile_source("-5");
// 变量操作数避免常量折叠：折叠后 -5 只剩单条 LOAD_CONST，无 NEG 指令。
let module = compile_source("var a = 5; -a");
let has_neg = module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::NEG);
assert!(has_neg);
@@ -209,17 +211,18 @@ fn compile_nested_object_literals_both_batch() {
#[test]
fn compile_binary_ops() {
// 变量操作数避免常量折叠：折叠后各表达式只剩单条 LOAD_CONST，无运算指令。
let tests = [
("3 * 4", OpCode::MUL),
("10 / 2", OpCode::DIV),
("7 % 3", OpCode::MOD),
("5 - 2", OpCode::SUB),
("5 & 3", OpCode::BIT_AND),
("5 | 2", OpCode::BIT_OR),
("5 ^ 1", OpCode::BIT_XOR),
("1 << 3", OpCode::SHL),
("-8 >> 1", OpCode::SHR),
("-1 >>> 0", OpCode::USHR),
("var a = 3, b = 4; a * b", OpCode::MUL),
("var a = 10, b = 2; a / b", OpCode::DIV),
("var a = 7, b = 3; a % b", OpCode::MOD),
("var a = 5, b = 2; a - b", OpCode::SUB),
("var a = 5, b = 3; a & b", OpCode::BIT_AND),
("var a = 5, b = 2; a | b", OpCode::BIT_OR),
("var a = 5, b = 1; a ^ b", OpCode::BIT_XOR),
("var a = 1, b = 3; a << b", OpCode::SHL),
("var a = -8, b = 1; a >> b", OpCode::SHR),
("var a = -1, b = 0; a >>> b", OpCode::USHR),
];
for (src, expected_op) in tests {
@@ -231,16 +234,18 @@ fn compile_binary_ops() {
#[test]
fn compile_bitwise_not() {
let module = compile_source("~0");
// 变量操作数避免常量折叠：折叠后 ~0 只剩单条 LOAD_CONST，无 BIT_NOT 指令。
let module = compile_source("var a = 0; ~a");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::BIT_NOT),
"~0 should emit BIT_NOT opcode"
"~a should emit BIT_NOT opcode"
);
}
#[test]
fn compile_ternary_emits_jumps() {
let module = compile_source("true ? 1 : 2");
// 条件走变量避免常量折叠：折叠后 true ? 1 : 2 只剩单条 LOAD_CONST，无分支指令。
let module = compile_source("var a = true; a ? 1 : 2");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::JMP_IF_FALSE),
"ternary should contain JMP_IF_FALSE"
@@ -249,16 +254,19 @@ fn compile_ternary_emits_jumps() {
#[test]
fn compile_logical_not() {
let module = compile_source("!true");
// 变量操作数避免常量折叠：折叠后 !true 只剩单条 LOAD_CONST，无 NOT 指令。
let module = compile_source("var a = true; !a");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::NOT),
"!true should emit NOT opcode"
"!a should emit NOT opcode"
);
}
#[test]
fn compile_logical_and_simple() {
let module = compile_source("1 && 2");
// 正则字面量作操作数：side-effect-free 但非字面量常量，避开字面量折叠，
// 走 AND 快路径；标识符操作数非 side-effect-free，会落分支路径不发 AND。
let module = compile_source("(/x/) && 2");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::AND),
"simple && should emit AND opcode"
@@ -267,7 +275,9 @@ fn compile_logical_and_simple() {
#[test]
fn compile_logical_or_simple() {
let module = compile_source("0 || 1");
// 正则字面量作操作数：side-effect-free 但非字面量常量，避开字面量折叠，
// 走 OR 快路径；标识符操作数非 side-effect-free，会落分支路径不发 OR。
let module = compile_source("(/x/) || 2");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::OR),
"simple || should emit OR opcode"
@@ -288,19 +298,21 @@ fn regression_coalesce_consistency() {
#[test]
fn compile_strict_eq() {
let module = compile_source("1 === 2");
// 变量操作数避免常量折叠：折叠后 1 === 2 只剩单条 LOAD_CONST，无 STRICT_EQ 指令。
let module = compile_source("var a = 1, b = 2; a === b");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::STRICT_EQ),
"1 === 2 should emit STRICT_EQ opcode"
"a === b should emit STRICT_EQ opcode"
);
}
#[test]
fn compile_strict_neq() {
let module = compile_source("1 !== 2");
// 变量操作数避免常量折叠：折叠后 1 !== 2 只剩单条 LOAD_CONST，无 STRICT_NEQ 指令。
let module = compile_source("var a = 1, b = 2; a !== b");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::STRICT_NEQ),
"1 !== 2 should emit STRICT_NEQ opcode"
"a !== b should emit STRICT_NEQ opcode"
);
}
@@ -315,7 +327,9 @@ fn compile_unary_plus() {
#[test]
fn compile_typeof_strict_eq() {
let module = compile_source("typeof 42 === 'number'");
// 变量操作数避免常量折叠：折叠后 typeof 42 === 'number' 只剩单条 LOAD_CONST，
// TYPEOF 与 STRICT_EQ 均消失。
let module = compile_source("var a = 42; typeof a === 'number'");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::TYPEOF),
"should emit TYPEOF opcode"
@@ -451,7 +465,9 @@ fn nullish_opcodes_round_trip() {
#[test]
fn compile_nullish_fast_path_opcode() {
let module = compile_source("null ?? 5");
// 正则字面量作操作数：side-effect-free 但非字面量常量，避开字面量折叠，
// 走 NULLISH 快路径；标识符操作数非 side-effect-free，会落分支路径不发 NULLISH。
let module = compile_source("(/x/) ?? 2");
assert!(
module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::NULLISH),
"side-effect-free ?? should emit NULLISH"
crates/oxide_vm/tests/object_graph_retention_tests.rs
+8 -3
View File
@@ -43,13 +43,18 @@ fn run_module(source: &str) -> Vm {
/// 留存锚：对象分配统一入口 Box 化后 run 末统一表含全部对象——整树节点
/// 字面量 32767 + 每次 JS 调用无条件创建的 arguments 对象 32767 + 直 session
/// 分配 2（makeNode 函数对象与其 prototype 子对象）= 65536；full GC 后逻辑
/// 存活集（整树 + 函数 2）在 session 内恰一份、无双计。
/// 分配 2（makeNode 函数对象与其 prototype 子对象）。run 期间 GC 阈值决定
/// 统一表实际留存量，故末态用范围断言；full GC 后逻辑存活集（整树 + 函数 2）
/// 在 session 内恰一份、无双计，为精确锚 32769。
#[test]
fn object_graph_retention_anchor() {
let mut vm = run_module(OBJECT_GRAPH);
assert_eq!(vm.session_object_count(), 65536, "run 末统一表计数（节点 + arguments + 直分配）");
let count = vm.session_object_count();
assert!(
count > 30000 && count < 70000,
"run 末统一表计数应落在 (30000, 70000)（节点 + arguments + 直分配，受 GC 阈值影响），实际 {count}"
);
vm.collect_session_gc();
assert_eq!(