From af61dcf6fce22b7e6e1dd1ca5edc99a88dbcde54 Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Wed, 12 Aug 2026 09:59:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ToPropertyKey=20=E6=94=B9=E8=B5=B0=20To?= =?UTF-8?q?Primitive=EF=BC=8CSymbol=20=E9=94=AE=E4=B8=8E=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E7=AC=A6=EF=BC=8C=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF=E5=8F=AF?= =?UTF-8?q?=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/oxide_builtins/src/date.rs | 11 ++- crates/oxide_builtins/src/number.rs | 11 ++- crates/oxide_builtins/src/object.rs | 17 ++++- crates/oxide_builtins/src/string.rs | 21 +++++- crates/oxide_builtins/src/symbol.rs | 75 ++++++++++++++++--- crates/oxide_runtime_api/src/lib.rs | 80 +++++++++++++++++++-- crates/oxide_types/src/object.rs | 8 +++ crates/oxide_vm/src/bindings/bind_symbol.rs | 5 +- crates/oxide_vm/src/dispatch/call.rs | 2 +- crates/oxide_vm/src/dispatch/member.rs | 6 +- crates/oxide_vm/src/dispatch/property.rs | 18 ++--- crates/oxide_vm/src/vm.rs | 68 ++++++++---------- crates/oxide_vm/src/vm_dispatch_ctrl.rs | 8 +-- crates/oxide_vm/src/vm_dispatch_misc.rs | 13 ++-- crates/oxide_vm/src/vm_state.rs | 6 +- crates/oxide_vm/tests/regression_tests.rs | 2 +- 16 files changed, 265 insertions(+), 86 deletions(-) diff --git a/crates/oxide_builtins/src/date.rs b/crates/oxide_builtins/src/date.rs index 1a14da89..8c7cc48f 100644 --- a/crates/oxide_builtins/src/date.rs +++ b/crates/oxide_builtins/src/date.rs @@ -190,7 +190,16 @@ pub fn date_constructor(vm: &mut H, args: &[u8]) -> NativeResult { let obj = unsafe { &*val.as_js_object_ptr() }; get_timestamp(obj) } else { - f64::NAN + match oxide_runtime_api::to_number_full(val, vm) { + Ok(n) => n, + Err(_) => { + // ToNumber on an object may throw via toString/valueOf; propagate the original exception. + if let Some(exc) = vm.take_uncaught_value() { + return NativeResult::Err(exc); + } + return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a number")); + } + } } }; diff --git a/crates/oxide_builtins/src/number.rs b/crates/oxide_builtins/src/number.rs index 62bfbc05..8f37457a 100644 --- a/crates/oxide_builtins/src/number.rs +++ b/crates/oxide_builtins/src/number.rs @@ -6,7 +6,16 @@ use oxide_runtime_api::{NativeResult, VmHost}; /// 普通调用返回原始 number（整数走 int 表示）；new 语义返回 `[[NumberData]]` 包装对象。 pub fn number_constructor(vm: &mut H, args: &[u8]) -> NativeResult { let n = if args.len() > 1 { - vm.coerce_number_bounded(vm.reg(args[1])).unwrap_or(f64::NAN) + match vm.coerce_number_bounded(vm.reg(args[1])) { + Ok(n) => n, + Err(_) => { + // ToNumber on an object may throw via toString/valueOf; propagate the original exception. + if let Some(exc) = vm.take_uncaught_value() { + return NativeResult::Err(exc); + } + return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a number")); + } + } } else { 0.0 }; diff --git a/crates/oxide_builtins/src/object.rs b/crates/oxide_builtins/src/object.rs index 68d7f726..100e4677 100644 --- a/crates/oxide_builtins/src/object.rs +++ b/crates/oxide_builtins/src/object.rs @@ -204,8 +204,13 @@ pub fn delete_own_property(vm: &mut H, obj: &mut JsObject, key_si: u3 } } + // walk_own_keys 只返回字符串键；Symbol 键（well-known/用户）需另行定位。 let keys = walk_own_keys(vm, obj); - let Some((_, delete_pos)) = keys.iter().find(|(si, _)| *si == key_si).copied() else { + let mut all_keys = keys; + if is_symbol_key(key_si) { + all_keys.extend(walk_own_symbol_keys(vm, obj)); + } + let Some(delete_pos) = all_keys.iter().find(|(si, _)| *si == key_si).map(|(_, pos)| *pos) else { return true; }; // delete_pos 是 shape 槽位；数组对象存储索引 = 元素数 + 槽位。 @@ -230,7 +235,7 @@ pub fn delete_own_property(vm: &mut H, obj: &mut JsObject, key_si: u3 None }; - let retained: Vec<(u32, JsValue, Option)> = keys + let retained: Vec<(u32, JsValue, Option)> = all_keys .into_iter() .filter(|(_, pos)| *pos != delete_pos) .map(|(si, pos)| { @@ -312,6 +317,14 @@ pub fn object_constructor(vm: &mut H, args: &[u8]) -> NativeResult { obj_ref.set_prop_at(0, val); return NativeResult::Ok(JsValue::from_js_object(obj)); } + if val.is_symbol() { + let proto = vm.session().builtin_world().symbol_proto.as_ptr() as *mut JsObject; + let obj = vm.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto))); + let obj_ref = unsafe { &mut *obj }; + obj_ref.type_tag = JsObject::OBJ_TYPE_SYMBOL_OBJ; + obj_ref.set_prop_at(0, val); + return NativeResult::Ok(JsValue::from_js_object(obj)); + } if val.is_bigint() { let proto = vm.session().builtin_world().bigint_proto.as_ptr() as *mut JsObject; let obj = vm.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto))); diff --git a/crates/oxide_builtins/src/string.rs b/crates/oxide_builtins/src/string.rs index 9634cfcc..2260d30e 100644 --- a/crates/oxide_builtins/src/string.rs +++ b/crates/oxide_builtins/src/string.rs @@ -114,9 +114,15 @@ pub fn string_value_of(vm: &mut H, args: &[u8]) -> NativeResult { pub fn string_constructor(vm: &mut H, args: &[u8]) -> NativeResult { let s = if args.len() > 1 { // 对象参数须经 ToPrimitive/ToString 完整转换（数组 → join，对象 → toString）。 - match oxide_runtime_api::to_string_full(vm.reg(args[1]), vm) { + match oxide_runtime_api::to_string_for_string_constructor(vm.reg(args[1]), vm) { Ok(s) => s, - Err(e) => return NativeResult::Err(crate::error::create_error(vm, &e)), + Err(_) => { + // ToString on an object may throw via toString/valueOf; propagate the original exception. + if let Some(exc) = vm.take_uncaught_value() { + return NativeResult::Err(exc); + } + return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string")); + } } } else { String::new() @@ -490,7 +496,16 @@ pub fn string_concat(vm: &mut H, args: &[u8]) -> NativeResult { builtins_debug!("String.prototype.concat called with {} args", args.len()); let mut result = try_string!(this_string(vm, args)); for &arg_reg in args.iter().skip(1) { - result.push_str(&oxide_runtime_api::to_string(vm.reg(arg_reg))); + match oxide_runtime_api::to_string_full(vm.reg(arg_reg), vm) { + Ok(s) => result.push_str(&s), + Err(_) => { + // ToString on an object may throw via toString/valueOf; propagate the original exception. + if let Some(exc) = vm.take_uncaught_value() { + return NativeResult::Err(exc); + } + return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string")); + } + } } NativeResult::Ok(vm.new_string(&result)) } diff --git a/crates/oxide_builtins/src/symbol.rs b/crates/oxide_builtins/src/symbol.rs index d346cc0f..04139484 100644 --- a/crates/oxide_builtins/src/symbol.rs +++ b/crates/oxide_builtins/src/symbol.rs @@ -24,35 +24,92 @@ pub fn symbol_constructor(vm: &mut H, args: &[u8]) -> NativeResult { } } + // 描述符按规范 ToString(description)：对象经 ToPrimitive(string hint) 强制转换， + // Symbol 抛 TypeError，对象方法抛出的原始异常原样传播。 let description = if args.len() > 1 { - oxide_runtime_api::to_string(vm.reg(args[1])) + match oxide_runtime_api::to_string_full(vm.reg(args[1]), vm) { + Ok(s) => s, + Err(_) => { + if let Some(exc) = vm.take_uncaught_value() { + return NativeResult::Err(exc); + } + return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string")); + } + } } else { String::new() }; - let idx = vm.symbol_intern(description); + let idx = vm.symbol_intern(Some(description)); NativeResult::Ok(JsValue::symbol(idx)) } /// `Symbol.prototype.toString`：返回 `Symbol(description)` 形式字符串。 /// this 必须是 Symbol，否则抛 TypeError。 +/// thisSymbolValue：Symbol 原样返回；包装对象解盒（prop 0 存原始 Symbol）；其它类型 TypeError。 +fn this_symbol_value(vm: &mut H, this_val: JsValue) -> Result { + if this_val.is_symbol() { + return Ok(this_val); + } + if this_val.is_object() { + let ptr = this_val.as_js_object_ptr(); + if !ptr.is_null() { + let obj = unsafe { &*ptr }; + if obj.proto().is_object() { + let proto_ptr = obj.proto().as_js_object_ptr(); + let symbol_proto = + vm.session().builtin_world().symbol_proto.as_ptr() as *mut oxide_types::object::JsObject; + if !proto_ptr.is_null() && std::ptr::eq(proto_ptr, symbol_proto) { + let v = obj.get_prop_at(0); + if v.is_symbol() { + return Ok(v); + } + } + } + } + } + Err(crate::error::create_type_error( + vm, + "Symbol.prototype method called on incompatible receiver", + )) +} + +/// `Symbol.prototype.toString`：返回 `Symbol(description)` 形式字符串。 +/// this 必须是 Symbol 或 Symbol 包装对象，否则抛 TypeError。 pub fn symbol_to_string(vm: &mut H, args: &[u8]) -> NativeResult { let this_val = vm.reg(args[0]); - if !this_val.is_symbol() { - return NativeResult::Err(crate::error::create_type_error(vm, "Symbol.prototype.toString requires a Symbol")); - } - - let idx = this_val.as_symbol_index(); + let sym = match this_symbol_value(vm, this_val) { + Ok(v) => v, + Err(e) => return NativeResult::Err(e), + }; + let idx = sym.as_symbol_index(); let desc = vm.symbol_description(idx).unwrap_or("").to_string(); let result = format!("Symbol({})", desc); NativeResult::Ok(vm.new_string(&result)) } +/// `Symbol.prototype.valueOf`：Symbol 原样返回；包装对象解盒返回其原始 Symbol。 +pub fn symbol_value_of(vm: &mut H, args: &[u8]) -> NativeResult { + match this_symbol_value(vm, vm.reg(args[0])) { + Ok(v) => NativeResult::Ok(v), + Err(e) => NativeResult::Err(e), + } +} + /// `Symbol.for(key)`：在全局 symbol 注册表中查找并返回同 key 的 Symbol； /// 不存在则新建并登记。同 key 的 Symbol 在全局唯一。 pub fn symbol_for(vm: &mut H, args: &[u8]) -> NativeResult { + // Symbol.for(key) 按规范 ToString(key)：对象经完整强制转换，异常原样传播。 let key = if args.len() > 1 { - oxide_runtime_api::to_string(vm.reg(args[1])) + match oxide_runtime_api::to_string_full(vm.reg(args[1]), vm) { + Ok(s) => s, + Err(_) => { + if let Some(exc) = vm.take_uncaught_value() { + return NativeResult::Err(exc); + } + return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string")); + } + } } else { "undefined".to_string() }; @@ -61,7 +118,7 @@ pub fn symbol_for(vm: &mut H, args: &[u8]) -> NativeResult { return NativeResult::Ok(JsValue::symbol(idx)); } - let idx = vm.symbol_intern(key.clone()); + let idx = vm.symbol_intern(Some(key.clone())); vm.symbol_register_global(key, idx); NativeResult::Ok(JsValue::symbol(idx)) } diff --git a/crates/oxide_runtime_api/src/lib.rs b/crates/oxide_runtime_api/src/lib.rs index c3381f0a..feeb763c 100644 --- a/crates/oxide_runtime_api/src/lib.rs +++ b/crates/oxide_runtime_api/src/lib.rs @@ -128,7 +128,8 @@ pub trait VmHost { /// 动态编译一个函数体（`Function` 构造器用）：把参数列表与函数体编译为可调用 /// 函数对象。编译或解析失败返回 `Err`，由调用方转为 `SyntaxError`。 fn create_dynamic_function(&mut self, params: &[String], body: &str) -> Result; - fn symbol_intern(&mut self, desc: String) -> u32; + /// `None` 表示无描述（`Symbol()`/`Symbol(undefined)`），`Some(desc)` 为字符串描述。 + fn symbol_intern(&mut self, desc: Option) -> u32; fn symbol_description(&self, idx: u32) -> Option<&str>; fn symbol_lookup_global(&self, key: &str) -> Option; fn symbol_register_global(&mut self, key: String, idx: u32); @@ -569,12 +570,12 @@ pub fn abstract_eq(lhs: JsValue, rhs: JsValue, host: &mut H) -> Resul return abstract_eq(lhs, JsValue::float(to_number(rhs)), host); } // 步骤 11：x 为 Number/String，y 为 Object → ToPrimitive(y)。 - if (lhs.is_int() || lhs.is_double() || lhs.is_string()) && rhs.is_object() { + if (lhs.is_int() || lhs.is_double() || lhs.is_string() || lhs.is_bigint() || lhs.is_symbol()) && rhs.is_object() { let prim = to_primitive(rhs, ToPrimitiveHint::Default, host)?; return abstract_eq(lhs, prim, host); } // 步骤 12：x 为 Object，y 为 Number/String → ToPrimitive(x)。 - if lhs.is_object() && (rhs.is_int() || rhs.is_double() || rhs.is_string()) { + if lhs.is_object() && (rhs.is_int() || rhs.is_double() || rhs.is_string() || rhs.is_bigint() || rhs.is_symbol()) { let prim = to_primitive(lhs, ToPrimitiveHint::Default, host)?; return abstract_eq(prim, rhs, host); } @@ -893,12 +894,83 @@ pub fn to_number_full(val: JsValue, host: &mut H) -> Result(val: JsValue, host: &mut H) -> Result { let primitive = to_primitive(val, ToPrimitiveHint::String, host)?; + if primitive.is_symbol() { + return Err(host.error_message_text("TypeError", "Cannot convert a Symbol value to a string")); + } Ok(to_string(primitive)) } +/// `String()` 构造器的字符串转换（§21.1.1.1）：Symbol 值（及本引擎以空对象表示的 +/// well-known symbol）返回描述串 `Symbol(desc)`；其余走完整 ToString。 +pub fn to_string_for_string_constructor(val: JsValue, host: &mut H) -> Result { + if val.is_object() { + if let Some(id) = well_known_symbol_id(host, val.as_js_object_ptr()) { + if let Some(name) = well_known_symbol_name(id) { + return Ok(format!("Symbol({name})")); + } + } + } + let primitive = to_primitive(val, ToPrimitiveHint::String, host)?; + if primitive.is_symbol() { + let desc = host.symbol_description(primitive.as_symbol_index()).unwrap_or(""); + return Ok(format!("Symbol({desc})")); + } + Ok(to_string(primitive)) +} + +/// Well-known symbols are stored as empty objects in the builtin world; map an object +/// pointer back to its well-known symbol id (0..WELL_KNOWN_SYMBOL_COUNT) if it is one. +pub fn well_known_symbol_id(host: &H, ptr: *mut JsObject) -> Option { + if ptr.is_null() { + return None; + } + let world = host.session().builtin_world(); + if std::ptr::eq(ptr, world.sym_iterator.as_ptr()) { + Some(0) + } else if std::ptr::eq(ptr, world.sym_match.as_ptr()) { + Some(1) + } else if std::ptr::eq(ptr, world.sym_replace.as_ptr()) { + Some(2) + } else if std::ptr::eq(ptr, world.sym_search.as_ptr()) { + Some(3) + } else if std::ptr::eq(ptr, world.sym_split.as_ptr()) { + Some(4) + } else if std::ptr::eq(ptr, world.sym_to_primitive.as_ptr()) { + Some(5) + } else if std::ptr::eq(ptr, world.sym_has_instance.as_ptr()) { + Some(6) + } else if std::ptr::eq(ptr, world.sym_match_all.as_ptr()) { + Some(7) + } else if std::ptr::eq(ptr, world.sym_async_iterator.as_ptr()) { + Some(8) + } else if std::ptr::eq(ptr, world.sym_to_string_tag.as_ptr()) { + Some(9) + } else { + None + } +} + +/// Descriptive name of a well-known symbol id, e.g. `Symbol.toStringTag` for id 9. +pub fn well_known_symbol_name(id: u32) -> Option<&'static str> { + Some(match id { + 0 => "Symbol.iterator", + 1 => "Symbol.match", + 2 => "Symbol.replace", + 3 => "Symbol.search", + 4 => "Symbol.split", + 5 => "Symbol.toPrimitive", + 6 => "Symbol.hasInstance", + 7 => "Symbol.matchAll", + 8 => "Symbol.asyncIterator", + 9 => "Symbol.toStringTag", + _ => return None, + }) +} + #[cfg(test)] mod tests { use super::*; diff --git a/crates/oxide_types/src/object.rs b/crates/oxide_types/src/object.rs index fa1ed686..03f12f93 100644 --- a/crates/oxide_types/src/object.rs +++ b/crates/oxide_types/src/object.rs @@ -450,6 +450,8 @@ impl JsObject { /// Temporal.PlainDateTime 对象：ISO 年/月/日与午夜后纳秒存于 prop 0-3。 pub const OBJ_TYPE_PLAIN_DATE_TIME: u8 = 19; /// Arguments 对象：`Object.prototype.toString` 返回 `[object Arguments]`。 + /// 装箱 Symbol 对象类型标签。 + pub const OBJ_TYPE_SYMBOL_OBJ: u8 = 21; pub const OBJ_TYPE_ARGUMENTS: u8 = 20; /// `is_session_epoch` 字段中的 session 标记位。 pub const SESSION_EPOCH_BIT: u8 = 0x01; @@ -481,6 +483,12 @@ impl JsObject { pub fn is_string_obj(&self) -> bool { self.type_tag == Self::OBJ_TYPE_STRING_OBJ } + + /// 是否装箱 Symbol 对象。 + #[inline] + pub fn is_symbol_obj(&self) -> bool { + self.type_tag == Self::OBJ_TYPE_SYMBOL_OBJ + } /// 是否 ArrayBuffer 对象。 #[inline] pub fn is_array_buffer_obj(&self) -> bool { diff --git a/crates/oxide_vm/src/bindings/bind_symbol.rs b/crates/oxide_vm/src/bindings/bind_symbol.rs index fca89525..450c9e7a 100644 --- a/crates/oxide_vm/src/bindings/bind_symbol.rs +++ b/crates/oxide_vm/src/bindings/bind_symbol.rs @@ -30,7 +30,10 @@ pub fn bind_symbol(core: &Arc, session: &KernelSession, global: &mut session.builtin_world(), proto, core, - &[("toString", oxide_builtins::symbol::symbol_to_string:: as *const (), 0)], + &[ + ("toString", oxide_builtins::symbol::symbol_to_string:: as *const (), 0), + ("valueOf", oxide_builtins::symbol::symbol_value_of:: as *const (), 0), + ], ); for (name, val) in [ diff --git a/crates/oxide_vm/src/dispatch/call.rs b/crates/oxide_vm/src/dispatch/call.rs index 5ea548ff..601fb7b0 100644 --- a/crates/oxide_vm/src/dispatch/call.rs +++ b/crates/oxide_vm/src/dispatch/call.rs @@ -570,7 +570,7 @@ impl Vm { pub(crate) fn dispatch_super_get_prop(&mut self, rd: usize, a: usize, b: usize) -> Result { vm_trace!("SUPER_GET_PROP rd={} a={} b={}", rd, a, b); let key_val = self.regs[b]; - let prop_name_si = self.property_key_si(key_val); + let prop_name_si = self.property_key_si(key_val)?; let Some(frame) = self.frames.last() else { self.raise_error_kind("ReferenceError", "super property used outside function")?; return Ok(true); diff --git a/crates/oxide_vm/src/dispatch/member.rs b/crates/oxide_vm/src/dispatch/member.rs index 28e2ed2b..c52c9194 100644 --- a/crates/oxide_vm/src/dispatch/member.rs +++ b/crates/oxide_vm/src/dispatch/member.rs @@ -115,7 +115,7 @@ impl Vm { let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], error_msg)? else { return Err(String::new()); }; - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; Ok((obj_ptr, prop_name_si)) } @@ -156,7 +156,7 @@ impl Vm { }; let receiver = self.regs[rd]; let obj = unsafe { &mut *obj_ptr }; - let prop_name_si = self.property_key_si(self.regs[a]); + let prop_name_si = self.property_key_si(self.regs[a])?; let prop_val = self.ordinary_get(obj, prop_name_si, receiver)?; let n = self.coerce_number_bounded(prop_val)?; let new_val = JsValue::float(n + 1.0); @@ -172,7 +172,7 @@ impl Vm { }; let receiver = self.regs[rd]; let obj = unsafe { &mut *obj_ptr }; - let prop_name_si = self.property_key_si(self.regs[a]); + let prop_name_si = self.property_key_si(self.regs[a])?; let prop_val = self.ordinary_get(obj, prop_name_si, receiver)?; let n = self.coerce_number_bounded(prop_val)?; let new_val = JsValue::float(n - 1.0); diff --git a/crates/oxide_vm/src/dispatch/property.rs b/crates/oxide_vm/src/dispatch/property.rs index 7e9e4053..2e9bf665 100644 --- a/crates/oxide_vm/src/dispatch/property.rs +++ b/crates/oxide_vm/src/dispatch/property.rs @@ -292,7 +292,7 @@ impl Vm { let val = self.regs[a]; let obj_ptr = val.as_object_ptr() as *mut JsObject; if obj_ptr.is_null() { - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; if let Some(resolved) = self.primitive_property_get(val, prop_name_si)? { self.regs[a] = resolved; self.pc += 3; @@ -308,7 +308,7 @@ impl Vm { } let obj = unsafe { &*obj_ptr }; - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; let (cached_shape_id, cached_slot, cached_depth) = ic_helper::read_ic_entry(&self.bytecode, &mut self.pc); let ic_pc = self.pc; if obj.has_prop_meta() { @@ -390,7 +390,7 @@ impl Vm { return Ok(()); }; - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; if self.kernel_core.perm_interner().lookup(prop_name_si) == Some("__proto__") { let proto_value = self.promote_if_needed_for_write_ptr(obj_ptr, self.regs[a]); if self.is_object_prototype(obj_ptr) && !proto_value.is_null() { @@ -450,7 +450,7 @@ impl Vm { fn dispatch_get_prop(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> { vm_trace!("GET_PROP rd={} a={} b={}", rd, a, b); - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; if let Some(value) = self.primitive_property_get(self.regs[rd], prop_name_si)? { self.regs[a] = value; return Ok(()); @@ -471,7 +471,7 @@ impl Vm { let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "Cannot create property on non-object")? else { return Ok(()); }; - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; if self.kernel_core.perm_interner().lookup(prop_name_si) == Some("__proto__") { let proto_value = self.promote_if_needed_for_write_ptr(obj_ptr, self.regs[a]); if self.is_object_prototype(obj_ptr) && !proto_value.is_null() { @@ -490,7 +490,7 @@ impl Vm { fn dispatch_get_prop_dynamic(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> { vm_trace!("GET_PROP_DYNAMIC rd={} a={} b={}", rd, a, b); - let prop_name_si = self.property_key_si(self.regs[a]); + let prop_name_si = self.property_key_si(self.regs[a])?; if let Some(value) = self.primitive_property_get(self.regs[rd], prop_name_si)? { self.regs[b] = value; return Ok(()); @@ -511,7 +511,7 @@ impl Vm { let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "Cannot create property on non-object")? else { return Ok(()); }; - let prop_name_si = self.property_key_si(self.regs[a]); + let prop_name_si = self.property_key_si(self.regs[a])?; if self.kernel_core.perm_interner().lookup(prop_name_si) == Some("__proto__") { let proto_value = self.promote_if_needed_for_write_ptr(obj_ptr, self.regs[b]); if self.is_object_prototype(obj_ptr) && !proto_value.is_null() { @@ -553,7 +553,7 @@ impl Vm { let prop_idx = self.bytecode[self.pc] as usize; self.pc += 1; let key_val = self.immutables().get(prop_idx).copied().unwrap_or_else(JsValue::undefined); - let prop_name_si = self.property_key_si(key_val); + let prop_name_si = self.property_key_si(key_val)?; let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "delete on non-object")? else { self.regs[rd] = JsValue::bool(true); return Ok(false); @@ -567,7 +567,7 @@ impl Vm { pub(crate) fn dispatch_delete_prop_dynamic(&mut self, rd: usize, b: usize) -> Result { vm_trace!("DELETE_PROP_DYNAMIC rd={}", rd); - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "delete on non-object")? else { self.regs[rd] = JsValue::bool(true); return Ok(false); diff --git a/crates/oxide_vm/src/vm.rs b/crates/oxide_vm/src/vm.rs index 8b5aad48..3acd0401 100644 --- a/crates/oxide_vm/src/vm.rs +++ b/crates/oxide_vm/src/vm.rs @@ -403,7 +403,7 @@ impl Vm { let sym_ptr = self.session.builtin_world().sym_to_primitive.as_ptr() as *mut JsObject; JsValue::from_js_object(sym_ptr) }; - let sym_si = self.property_key_si(sym_key); + let sym_si = self.property_key_si(sym_key)?; let exotic = { let obj = unsafe { &*obj_ptr }; self.ordinary_get(obj, sym_si, value)? @@ -411,7 +411,9 @@ impl Vm { if !exotic.is_undefined() && !exotic.is_null() { let exotic_ptr = exotic.as_js_object_ptr(); if !exotic.is_object() || exotic_ptr.is_null() || !unsafe { &*exotic_ptr }.is_function() { - return Err(self.error_message_text("TypeError", "Symbol.toPrimitive is not a function")); + // 抛可捕获的 JS 异常（dispatch 层 try/catch 可捕获），与下方 method 不可调用路径一致。 + self.raise_error_kind("TypeError", "Symbol.toPrimitive is not a function")?; + return Ok(JsValue::undefined()); } let hint_val = self.new_string(if prefer_string { "string" } else { "number" }); let result = match self.call_function_sync(exotic, value, &[hint_val]) { @@ -419,7 +421,8 @@ impl Vm { Err(err) => return self.raise_call_error(&err), }; if result.is_object() { - return Err(self.error_message_text("TypeError", "Cannot convert object to primitive value")); + self.raise_error_kind("TypeError", "Cannot convert object to primitive value")?; + return Ok(JsValue::undefined()); } return Ok(result); } @@ -454,7 +457,10 @@ impl Vm { } } - Err(self.error_message_text("TypeError", "Cannot convert object to primitive value")) + // 同样抛可捕获异常而非裸 Err：dispatch 二元运算/移位中对象无法转原始值时， + // 必须让外围 JS try/catch 能捕获（裸 Err 会变成不可捕获的引擎错误）。 + self.raise_error_kind("TypeError", "Cannot convert object to primitive value")?; + Ok(JsValue::undefined()) } /// 把 `call_function_sync` 返回的调用错误恢复为原始异常值并走异常展开， @@ -874,50 +880,32 @@ impl Vm { } } - pub(crate) fn property_key_si(&mut self, val: JsValue) -> u32 { + pub(crate) fn property_key_si(&mut self, val: JsValue) -> Result { if val.is_string() { // SAFETY: val 是字符串值，把其内容桥接为永久 key id。 let s = unsafe { &(*val.as_string_ptr()).data }; - return self.kernel_core.perm_interner().intern(s).0; + return Ok(self.kernel_core.perm_interner().intern(s).0); } // Symbol 值直接编码为 Symbol 键（不进字符串 interner，键相互独立）。 if val.is_symbol() { - return make_symbol_key(val.as_symbol_index()); + return Ok(make_symbol_key(val.as_symbol_index())); } // well-known symbol 是空对象：按指针比对映射到各自的 well-known Symbol 键， // 避免全部塌缩成同一个键。 if val.is_object() { - let world = self.session.builtin_world(); - let ptr = val.as_js_object_ptr(); - let well_known_id = if std::ptr::eq(ptr, world.sym_iterator.as_ptr()) { - Some(0) - } else if std::ptr::eq(ptr, world.sym_match.as_ptr()) { - Some(1) - } else if std::ptr::eq(ptr, world.sym_replace.as_ptr()) { - Some(2) - } else if std::ptr::eq(ptr, world.sym_search.as_ptr()) { - Some(3) - } else if std::ptr::eq(ptr, world.sym_split.as_ptr()) { - Some(4) - } else if std::ptr::eq(ptr, world.sym_to_primitive.as_ptr()) { - Some(5) - } else if std::ptr::eq(ptr, world.sym_has_instance.as_ptr()) { - Some(6) - } else if std::ptr::eq(ptr, world.sym_match_all.as_ptr()) { - Some(7) - } else if std::ptr::eq(ptr, world.sym_async_iterator.as_ptr()) { - Some(8) - } else if std::ptr::eq(ptr, world.sym_to_string_tag.as_ptr()) { - Some(9) - } else { - None - }; - if let Some(id) = well_known_id { - return make_well_known_symbol_key(id); + if let Some(id) = oxide_runtime_api::well_known_symbol_id(self, val.as_js_object_ptr()) { + return Ok(make_well_known_symbol_key(id)); } + // ToPropertyKey：对象经 ToPrimitive(string hint)，结果为 Symbol 时直接作键。 + let prim = coercion::to_primitive(val, coercion::ToPrimitiveHint::String, self)?; + if prim.is_symbol() { + return Ok(make_symbol_key(prim.as_symbol_index())); + } + let key = coercion::to_string(prim); + return Ok(self.kernel_core.perm_interner().intern(&key).0); } let key = coercion::to_string(val); - self.kernel_core.perm_interner().intern(&key).0 + Ok(self.kernel_core.perm_interner().intern(&key).0) } pub(crate) fn array_index_from_property_key(&self, prop_name_si: u32) -> Option { @@ -1555,7 +1543,7 @@ impl Vm { } OpCode::TEMPLATE_STR => { - self.dispatch_template_str(rd); + self.dispatch_template_str(rd)?; } OpCode::DELETE_PROP_STATIC => match self.dispatch_delete_prop_static(rd) { @@ -1802,7 +1790,11 @@ impl oxide_runtime_api::VmHost for Vm { self.last_uncaught_value.take() } fn property_key_si(&mut self, val: JsValue) -> u32 { + // Object-key conversion (to_string_full) failures degrade to the empty key here: + // this trait path is used by Reflect/Object builtins; computed property access + // uses the inherent Result-returning version to preserve the full exception. self.property_key_si(val) + .unwrap_or_else(|_| self.kernel_core.perm_interner().intern("").0) } fn resolve_property(&self, obj: &JsObject, prop_name_si: u32) -> Option { self.resolve_property(obj, prop_name_si) @@ -1883,7 +1875,7 @@ impl oxide_runtime_api::VmHost for Vm { fn create_dynamic_function(&mut self, params: &[String], body: &str) -> Result { self.create_dynamic_function(params, body) } - fn symbol_intern(&mut self, desc: String) -> u32 { + fn symbol_intern(&mut self, desc: Option) -> u32 { self.symbols.intern(desc) } fn symbol_description(&self, idx: u32) -> Option<&str> { @@ -2118,7 +2110,7 @@ mod tests { #[test] fn full_reset_clears_symbol_state() { let mut vm = Vm::new(); - vm.symbols.intern("shared".to_string()); + vm.symbols.intern(Some("shared".to_string())); vm.full_reset(); diff --git a/crates/oxide_vm/src/vm_dispatch_ctrl.rs b/crates/oxide_vm/src/vm_dispatch_ctrl.rs index 86b40a52..ff2b1047 100644 --- a/crates/oxide_vm/src/vm_dispatch_ctrl.rs +++ b/crates/oxide_vm/src/vm_dispatch_ctrl.rs @@ -132,7 +132,7 @@ impl Vm { let prop_name_si = if key_val.is_int() { make_private_name_id(key_val.as_int().max(0) as u32) } else { - self.property_key_si(key_val) + self.property_key_si(key_val)? }; self.dispatch_define_accessor_common(rd, a, b, prop_name_si) } @@ -143,7 +143,7 @@ impl Vm { let key_word = self.bytecode[self.pc]; self.pc += 1; let key_reg = (key_word & 0x7FFF_FFFF) as usize; - let prop_name_si = self.property_key_si(self.regs[key_reg]); + let prop_name_si = self.property_key_si(self.regs[key_reg])?; self.dispatch_define_accessor_common(rd, a, b, prop_name_si) } @@ -186,7 +186,7 @@ impl Vm { if !obj_val.is_object() { return self.raise_type_error("DEFINE_PROP target is not object"); } - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; let value = self.regs[a]; let obj = unsafe { &mut *obj_val.as_js_object_ptr() }; match self.define_data_property(obj, prop_name_si, value, PropAttributes::DEFAULT_DATA) { @@ -208,7 +208,7 @@ impl Vm { if !obj_val.is_object() { return Ok(()); } - let prop_name_si = self.property_key_si(self.regs[b]); + let prop_name_si = self.property_key_si(self.regs[b])?; let value = self.regs[a]; let obj = unsafe { &mut *obj_val.as_js_object_ptr() }; let _ = self.define_data_property(obj, prop_name_si, value, PropAttributes::new(true, true, false)); diff --git a/crates/oxide_vm/src/vm_dispatch_misc.rs b/crates/oxide_vm/src/vm_dispatch_misc.rs index 58a0efa4..08c727d0 100644 --- a/crates/oxide_vm/src/vm_dispatch_misc.rs +++ b/crates/oxide_vm/src/vm_dispatch_misc.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use crate::native::NativeFn; use crate::vm::{native_fn_ptr_to_fn, CallFrame, ForInIter, FrameContinuation, Vm, MAX_PROTO_CHAIN_DEPTH}; use crate::vm_trace; -use oxide_runtime_api::{to_boolean, NativeResult}; +use oxide_runtime_api::{to_boolean, to_string_full, NativeResult}; use oxide_types::object::{JsObject, PropAttributes}; use oxide_types::private_key::{is_private_name_key, is_symbol_key}; use oxide_types::value::JsValue; @@ -187,7 +187,7 @@ impl Vm { } } - pub(crate) fn dispatch_template_str(&mut self, rd: usize) { + pub(crate) fn dispatch_template_str(&mut self, rd: usize) -> Result<(), String> { vm_trace!("TEMPLATE_STR rd={}", rd); let header = self.bytecode[self.pc]; self.pc += 1; @@ -205,7 +205,7 @@ impl Vm { // SAFETY: val 是字符串值。 unsafe { (*val.as_string_ptr()).data.clone() } } else { - format!("{}", val) + to_string_full(val, self)? }; result.push_str(&s); } else { @@ -222,6 +222,7 @@ impl Vm { } } self.regs[rd] = self.new_string(&result); + Ok(()) } pub(crate) fn dispatch_instanceof(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> { @@ -235,7 +236,7 @@ impl Vm { let has_instance_ptr = self.session.builtin_world().sym_has_instance.as_ptr() as *mut JsObject; let has_instance_key = JsValue::from_js_object(has_instance_ptr); - let has_instance_si = self.property_key_si(has_instance_key); + let has_instance_si = self.property_key_si(has_instance_key)?; let ctor_obj = unsafe { &*rhs_val.as_js_object_ptr() }; let has_instance_val = self.ordinary_get(ctor_obj, has_instance_si, rhs_val)?; @@ -298,7 +299,7 @@ impl Vm { return self.raise_type_error("IN right-hand side is not an object"); } let obj = unsafe { &*obj_ptr }; - let prop_name_si = self.property_key_si(key_val); + let prop_name_si = self.property_key_si(key_val)?; let found = self.resolve_property(obj, prop_name_si).is_some(); self.regs[rd] = JsValue::bool(found); Ok(()) @@ -769,7 +770,7 @@ impl Vm { if arr_obj.is_array() { for i in 0..arr_obj.array_prop_count { let v = arr_obj.get_prop_at(i); - let si = self.property_key_si(v); + let si = self.property_key_si(v)?; excluded.insert(si); } } diff --git a/crates/oxide_vm/src/vm_state.rs b/crates/oxide_vm/src/vm_state.rs index 872dea4e..b27508e9 100644 --- a/crates/oxide_vm/src/vm_state.rs +++ b/crates/oxide_vm/src/vm_state.rs @@ -46,7 +46,7 @@ impl GcState { /// Symbol 的 intern 状态。 pub(crate) struct SymbolState { pub(crate) symbol_counter: u32, - pub(crate) symbol_descriptions: Vec, + pub(crate) symbol_descriptions: Vec>, pub(crate) symbol_registry: HashMap, } @@ -57,7 +57,7 @@ impl SymbolState { self.symbol_registry.clear(); } - pub(crate) fn intern(&mut self, description: String) -> u32 { + pub(crate) fn intern(&mut self, description: Option) -> u32 { self.symbol_counter = self.symbol_counter.wrapping_add(1); let idx = self.symbol_descriptions.len() as u32; self.symbol_descriptions.push(description); @@ -73,7 +73,7 @@ impl SymbolState { } pub(crate) fn description(&self, id: u32) -> Option<&str> { - self.symbol_descriptions.get(id as usize).map(|s| s.as_str()) + self.symbol_descriptions.get(id as usize).and_then(|s| s.as_deref()) } pub(crate) fn key_for_id(&self, id: u32) -> Option { diff --git a/crates/oxide_vm/tests/regression_tests.rs b/crates/oxide_vm/tests/regression_tests.rs index 4afa4ab6..3dce8861 100644 --- a/crates/oxide_vm/tests/regression_tests.rs +++ b/crates/oxide_vm/tests/regression_tests.rs @@ -223,7 +223,7 @@ fn regression_bounded_object_numeric_coercion() { assert_eq!(eval("+({ toString: function() { return '9'; } })"), "9"); assert_eq!( eval("+({ valueOf: function() { return {}; }, toString: function() { return {}; } })"), - "vm error: TypeError: Cannot convert object to primitive value" + "vm error: uncaught TypeError: Cannot convert object to primitive value" ); assert_eq!( eval("+({ valueOf: function() { throw new RangeError('coerce'); } })"),