ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-26 19:51:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Map set/getOrInsert 缺省实参取 undefined 而非寄存器残留

Browse Source
This commit is contained in:
彭俊皓
2026-10-14 08:14:29 +00:00
parent fe430d4bcb
commit 38885df582
4 changed files with 55 additions and 27 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]] [[package]]
name = "oxide_builtins" name = "oxide_builtins"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"chrono", "chrono",
"fast-float", "fast-float",
@@ -1185,7 +1185,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_bytecode" name = "oxide_bytecode"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_log", "oxide_log",
@@ -1193,7 +1193,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cfg" name = "oxide_cfg"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_emit", "oxide_emit",
@@ -1204,7 +1204,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cli" name = "oxide_cli"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"bumpalo", "bumpalo",
@@ -1228,7 +1228,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_code_cache" name = "oxide_code_cache"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"lru", "lru",
"oxide_bytecode", "oxide_bytecode",
@@ -1237,7 +1237,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_compiler" name = "oxide_compiler"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1258,7 +1258,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_dce" name = "oxide_dce"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1272,7 +1272,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_emit" name = "oxide_emit"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxc_allocator", "oxc_allocator",
@@ -1288,7 +1288,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_engine" name = "oxide_engine"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1300,7 +1300,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_fold" name = "oxide_fold"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_bytecode", "oxide_bytecode",
@@ -1312,7 +1312,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_ir" name = "oxide_ir"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_log", "oxide_log",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_kernel" name = "oxide_kernel"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1335,7 +1335,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_liveness" name = "oxide_liveness"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1347,7 +1347,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_log" name = "oxide_log"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"tracing", "tracing",
"tracing-appender", "tracing-appender",
@@ -1356,11 +1356,11 @@ dependencies = [
[[package]] [[package]]
name = "oxide_net" name = "oxide_net"
version = "0.19.8" version = "0.19.9"
[[package]] [[package]]
name = "oxide_parser" name = "oxide_parser"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxc_allocator", "oxc_allocator",
"oxc_ast", "oxc_ast",
@@ -1375,7 +1375,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_regalloc" name = "oxide_regalloc"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1391,7 +1391,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_runtime_api" name = "oxide_runtime_api"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"num-traits", "num-traits",
@@ -1404,7 +1404,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_test262" name = "oxide_test262"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1424,7 +1424,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_types" name = "oxide_types"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1437,7 +1437,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_vm" name = "oxide_vm"
version = "0.19.8" version = "0.19.9"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"chrono", "chrono",
Cargo.toml
+1 -1
View File
@@ -25,7 +25,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "0.19.8" version = "0.19.9"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
rust-version = "1.80" rust-version = "1.80"
crates/oxide_builtins/src/map.rs
+4 -4
View File
@@ -292,8 +292,8 @@ pub fn map_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn map_set<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult { pub fn map_set<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] }); let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let inner = native_try!(get_map_inner(vm, this_val)); let inner = native_try!(get_map_inner(vm, this_val));
let key = vm.reg(if args.len() > 1 { args[1] } else { 0 }); let key = if args.len() > 1 { vm.reg(args[1]) } else { JsValue::undefined() };
let val = vm.reg(if args.len() > 2 { args[2] } else { 0 }); let val = if args.len() > 2 { vm.reg(args[2]) } else { JsValue::undefined() };
unsafe { unsafe {
(*inner).insert(SetKey(key), val); (*inner).insert(SetKey(key), val);
} }
@@ -318,8 +318,8 @@ pub fn map_get<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn map_get_or_insert<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult { pub fn map_get_or_insert<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] }); let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let inner = native_try!(get_map_inner(vm, this_val)); let inner = native_try!(get_map_inner(vm, this_val));
let key = vm.reg(if args.len() > 1 { args[1] } else { 0 }); let key = if args.len() > 1 { vm.reg(args[1]) } else { JsValue::undefined() };
let val = vm.reg(if args.len() > 2 { args[2] } else { 0 }); let val = if args.len() > 2 { vm.reg(args[2]) } else { JsValue::undefined() };
let found = unsafe { (*inner).get(&SetKey(key)) }; let found = unsafe { (*inner).get(&SetKey(key)) };
if let Some(existing) = found { if let Some(existing) = found {
return NativeResult::Ok(existing); return NativeResult::Ok(existing);
crates/oxide_vm/tests/builtins_map_tests.rs
+29 -1
View File
@@ -1,6 +1,9 @@
use std::sync::Arc; use std::sync::Arc;
use oxide_builtins::map::{map_clear, map_constructor as new_map, map_delete, map_get, map_has, map_set, map_size}; use oxide_builtins::map::{
map_clear, map_constructor as new_map, map_delete, map_get, map_get_or_insert, map_has,
map_set, map_size,
};
use oxide_compiler::compiler::Compiler; use oxide_compiler::compiler::Compiler;
use oxide_kernel::shape_forge::EMPTY_SHAPE_ID; use oxide_kernel::shape_forge::EMPTY_SHAPE_ID;
use oxide_runtime_api::VmHost; use oxide_runtime_api::VmHost;
@@ -84,6 +87,31 @@ fn tmap_size_and_clear() {
assert_eq!(map_size(&mut vm, &[0]).unwrap().as_double(), 0.0); assert_eq!(map_size(&mut vm, &[0]).unwrap().as_double(), 0.0);
} }
#[test]
fn tmap_set_missing_value_defaults_undefined() {
// 缺省 value 实参：存储值取 undefined，不读调用方结果槽残留。
let mut vm = Vm::new();
map_this(&mut vm);
let m = new_map(&mut vm, &[0]).unwrap();
vm.set_reg(0, m);
vm.set_reg(1, JsValue::float(5.0));
map_set(&mut vm, &[0, 1]).unwrap();
assert!(map_get(&mut vm, &[0, 1]).unwrap().is_undefined());
}
#[test]
fn tmap_get_or_insert_missing_value_defaults_undefined() {
// 缺省 value 实参且键缺失：返回值与存储值均取 undefined，不读调用方结果槽残留。
let mut vm = Vm::new();
map_this(&mut vm);
let m = new_map(&mut vm, &[0]).unwrap();
vm.set_reg(0, m);
vm.set_reg(1, JsValue::float(5.0));
let r = map_get_or_insert(&mut vm, &[0, 1]).unwrap();
assert!(r.is_undefined());
assert!(map_get(&mut vm, &[0, 1]).unwrap().is_undefined());
}
// ── 经 JS 使用 new 关键字的 eval 测试（每个测试一次 eval）── // ── 经 JS 使用 new 关键字的 eval 测试（每个测试一次 eval）──
#[test] #[test]