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

feat: ToPropertyKey 改走 ToPrimitive，Symbol 键与描述符，转换错误可捕获

Browse Source
This commit is contained in:
彭俊皓
2026-08-12 09:59:56 +08:00
parent c287708ddc
commit af61dcf6fc
16 changed files with 265 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/bindings/bind_symbol.rs
+4 -1
View File
@@ -30,7 +30,10 @@ pub fn bind_symbol(core: &Arc<KernelCore>, session: &KernelSession, global: &mut
session.builtin_world(),
proto,
core,
&[("toString", oxide_builtins::symbol::symbol_to_string::<crate::vm::Vm> as *const (), 0)],
&[
("toString", oxide_builtins::symbol::symbol_to_string::<crate::vm::Vm> as *const (), 0),
("valueOf", oxide_builtins::symbol::symbol_value_of::<crate::vm::Vm> as *const (), 0),
],
);
for (name, val) in [
crates/oxide_vm/src/dispatch/call.rs
+1 -1
View File
@@ -570,7 +570,7 @@ impl Vm {
pub(crate) fn dispatch_super_get_prop(&mut self, rd: usize, a: usize, b: usize) -> Result<bool, String> {
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);
crates/oxide_vm/src/dispatch/member.rs
+3 -3
View File
@@ -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);
crates/oxide_vm/src/dispatch/property.rs
+9 -9
View File
@@ -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<bool, String> {
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);
crates/oxide_vm/src/vm.rs
+30 -38
View File
@@ -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<u32, String> {
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<u32> {
@@ -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<JsValue> {
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<JsValue, String> {
self.create_dynamic_function(params, body)
}
fn symbol_intern(&mut self, desc: String) -> u32 {
fn symbol_intern(&mut self, desc: Option<String>) -> 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();
crates/oxide_vm/src/vm_dispatch_ctrl.rs
+4 -4
View File
@@ -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));
crates/oxide_vm/src/vm_dispatch_misc.rs
+7 -6
View File
@@ -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);
}
}
crates/oxide_vm/src/vm_state.rs
+3 -3
View File
@@ -46,7 +46,7 @@ impl GcState {
/// Symbol 的 intern 状态。
pub(crate) struct SymbolState {
pub(crate) symbol_counter: u32,
pub(crate) symbol_descriptions: Vec<String>,
pub(crate) symbol_descriptions: Vec<Option<String>>,
pub(crate) symbol_registry: HashMap<String, u32>,
}
@@ -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<String>) -> 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<String> {