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

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
+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 {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let inner = native_try!(get_map_inner(vm, this_val));
let key = vm.reg(if args.len() > 1 { args[1] } else { 0 });
let val = vm.reg(if args.len() > 2 { args[2] } else { 0 });
let key = if args.len() > 1 { vm.reg(args[1]) } else { JsValue::undefined() };
let val = if args.len() > 2 { vm.reg(args[2]) } else { JsValue::undefined() };
unsafe {
(*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 {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let inner = native_try!(get_map_inner(vm, this_val));
let key = vm.reg(if args.len() > 1 { args[1] } else { 0 });
let val = vm.reg(if args.len() > 2 { args[2] } else { 0 });
let key = if args.len() > 1 { vm.reg(args[1]) } else { JsValue::undefined() };
let val = if args.len() > 2 { vm.reg(args[2]) } else { JsValue::undefined() };
let found = unsafe { (*inner).get(&SetKey(key)) };
if let Some(existing) = found {
return NativeResult::Ok(existing);
+29 -1
View File
@@ -1,6 +1,9 @@
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_kernel::shape_forge::EMPTY_SHAPE_ID;
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);
}
#[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)──
#[test]