fix: if 无 else 假支显式写 undefined 消除寄存器初始化巧合依赖

This commit is contained in:
2026-10-05 22:38:53 +00:00
parent 013c0eb3cf
commit 0a1ca83661
4 changed files with 34 additions and 22 deletions
Generated
+18 -18
View File
@@ -1095,7 +1095,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_builtins" name = "oxide_builtins"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"chrono", "chrono",
"fast-float", "fast-float",
@@ -1120,7 +1120,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_bytecode" name = "oxide_bytecode"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_log", "oxide_log",
@@ -1128,7 +1128,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cfg" name = "oxide_cfg"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_emit", "oxide_emit",
@@ -1139,7 +1139,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cli" name = "oxide_cli"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"bumpalo", "bumpalo",
@@ -1159,7 +1159,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_code_cache" name = "oxide_code_cache"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"lru", "lru",
"oxide_bytecode", "oxide_bytecode",
@@ -1168,7 +1168,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_compiler" name = "oxide_compiler"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1187,7 +1187,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_dce" name = "oxide_dce"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1201,7 +1201,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_emit" name = "oxide_emit"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxc_allocator", "oxc_allocator",
@@ -1216,7 +1216,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_ir" name = "oxide_ir"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_log", "oxide_log",
@@ -1225,7 +1225,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_kernel" name = "oxide_kernel"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1240,7 +1240,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_liveness" name = "oxide_liveness"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1252,7 +1252,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_log" name = "oxide_log"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"tracing", "tracing",
"tracing-appender", "tracing-appender",
@@ -1261,7 +1261,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_parser" name = "oxide_parser"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxc_allocator", "oxc_allocator",
"oxc_ast", "oxc_ast",
@@ -1276,7 +1276,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_regalloc" name = "oxide_regalloc"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1292,7 +1292,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_runtime_api" name = "oxide_runtime_api"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"num-traits", "num-traits",
@@ -1304,7 +1304,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_test262" name = "oxide_test262"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_types" name = "oxide_types"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"hashbrown 0.14.5", "hashbrown 0.14.5",
@@ -1333,7 +1333,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_vm" name = "oxide_vm"
version = "0.8.14" version = "0.8.15"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"chrono", "chrono",
+1 -1
View File
@@ -22,7 +22,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "0.8.14" version = "0.8.15"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
rust-version = "1.80" rust-version = "1.80"
+7 -3
View File
@@ -32,9 +32,8 @@ impl Emitter {
ctx.inst(Inst::load_const(Operand::Reg(result_reg), undef_idx)); ctx.inst(Inst::load_const(Operand::Reg(result_reg), undef_idx));
} }
if ifs.alternate.is_some() { // 真支无条件跳末尾,无 else 时防穿落假支。
ctx.inst(Inst::jmp(end_label)); ctx.inst(Inst::jmp(end_label));
}
ctx.labels.set_label_pos(else_label, ctx.insts.len()); ctx.labels.set_label_pos(else_label, ctx.insts.len());
if let Some(alt) = &ifs.alternate { if let Some(alt) = &ifs.alternate {
@@ -47,6 +46,11 @@ impl Emitter {
let undef_idx = ctx.add_constant(Constant::Undefined); let undef_idx = ctx.add_constant(Constant::Undefined);
ctx.inst(Inst::load_const(Operand::Reg(result_reg), undef_idx)); ctx.inst(Inst::load_const(Operand::Reg(result_reg), undef_idx));
} }
} else {
// 无 else 的假支显式写 undefined:完成值在所有路径都有定义,
// 不依赖寄存器文件初始值,防物理槽别名泄漏前值。
let undef_idx = ctx.add_constant(Constant::Undefined);
ctx.inst(Inst::load_const(Operand::Reg(result_reg), undef_idx));
} }
ctx.labels.set_label_pos(end_label, ctx.insts.len()); ctx.labels.set_label_pos(end_label, ctx.insts.len());
@@ -41,6 +41,14 @@ fn eval_if_without_else_false() {
assert_eq!(eval("if (false) { 42 }"), "undefined"); assert_eq!(eval("if (false) { 42 }"), "undefined");
} }
#[test]
fn eval_if_no_else_false_branch_undefined() {
// 顶层脚本完成值直读 if 的 result_reg:假支前有用后死的 vreg(x 持 1,
// 被 keep 调用读取后死亡),其物理槽可能与 result_reg 别名。假支必须显式
// 写 undefined,不得泄漏该槽前值。
assert_eq!(eval("let x = 1; function keep(v){ return v; } keep(x); if (false) { }"), "undefined");
}
#[test] #[test]
fn eval_dangling_else() { fn eval_dangling_else() {
assert_eq!(eval("if (true) { if (false) { 1 } else { 2 } }"), "2"); assert_eq!(eval("if (true) { if (false) { 1 } else { 2 } }"), "2");