mirror of
https://github.com/pjh456/OxideJS.git
synced 2026-10-23 18:21:13 +08:00
perf: 对象字面量批量构造键序预建 shape
This commit is contained in:
@@ -144,14 +144,50 @@ impl Vm {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 创建空对象;带键常量表时(a 槽 = 属性数 ≤255,ext = 每键常量池下标)按纯静态
|
||||
/// 数据键前缀批量构造:单次链式 `make_shape` 预建整条 shape、预分配全部数据槽,
|
||||
/// 后续属性值经 SET_PROP_BATCH 纯槽写。
|
||||
///
|
||||
/// # 步骤
|
||||
/// 1. 逐个键常量取 perm string → `property_key_si`(与逐属性 SET_PROP 路径
|
||||
/// 逐字节同键),链式 `make_shape` 累加 shape。
|
||||
/// 2. 分配对象、预填充 `nprops` 个数据槽、`generation += nprops`(与逐属性路径终值一致)。
|
||||
///
|
||||
/// # 边界与前提
|
||||
/// - `nprops = 0` 时退化为普通空对象(无 ext 键表)。
|
||||
/// - 键常量越界取 undefined 防御(emit 保证合法下标)。
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_new_object(&mut self, rd: usize) {
|
||||
vm_trace!("NEW_OBJECT rd={}", rd);
|
||||
pub(crate) fn dispatch_new_object(&mut self, rd: usize, instr: u32) -> Result<(), String> {
|
||||
let nprops = opcode::a(instr) as usize;
|
||||
vm_trace!("NEW_OBJECT rd={} nprops={}", rd, nprops);
|
||||
let proto_ptr = &*self.object_prototype as *const JsObject as *mut JsObject;
|
||||
let mut shape_id = EMPTY_SHAPE_ID;
|
||||
if nprops > 0 {
|
||||
// 先把键常量值拷出(immutables 借 self,property_key_si 需 &mut self)。
|
||||
let key_vals: Vec<JsValue> = {
|
||||
let imm = self.immutables();
|
||||
self.bytecode[self.pc..self.pc + nprops]
|
||||
.iter()
|
||||
.map(|w| imm.get(*w as usize).copied().unwrap_or(JsValue::undefined()))
|
||||
.collect()
|
||||
};
|
||||
self.pc += nprops;
|
||||
for key_val in key_vals {
|
||||
let si = self.property_key_si(key_val)?;
|
||||
shape_id = self.kernel_core.shape_forge().make_shape(shape_id, si);
|
||||
}
|
||||
}
|
||||
let obj = self
|
||||
.epoch
|
||||
.alloc(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto_ptr)));
|
||||
.alloc(JsObject::new_empty(shape_id, JsValue::from_js_object(proto_ptr)));
|
||||
// 预分配数据槽并同步 generation:批量一次性 +nprops,与逐属性路径的终值一致。
|
||||
let obj_ref = unsafe { &mut *obj };
|
||||
for _ in 0..nprops {
|
||||
obj_ref.push_prop(JsValue::undefined());
|
||||
obj_ref.bump_generation();
|
||||
}
|
||||
self.regs[rd] = JsValue::object(obj as *mut u8);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 创建 arguments 对象:索引属性取当前帧(或 inline 同步调用)的完整实参,
|
||||
|
||||
@@ -20,6 +20,7 @@ impl Vm {
|
||||
OpCode::IC_SET_PROP => self.dispatch_ic_set_prop(rd, a, b),
|
||||
OpCode::GET_PROP => self.dispatch_get_prop(rd, a, b),
|
||||
OpCode::SET_PROP => self.dispatch_set_prop(rd, a, b),
|
||||
OpCode::SET_PROP_BATCH => self.dispatch_set_prop_batch(rd, a, b),
|
||||
OpCode::GET_PROP_DYNAMIC => self.dispatch_get_prop_dynamic(rd, a, b),
|
||||
OpCode::SET_PROP_DYNAMIC => self.dispatch_set_prop_dynamic(rd, a, b),
|
||||
OpCode::SET_ELEM => self.dispatch_set_elem(rd, a, b),
|
||||
@@ -500,6 +501,24 @@ impl Vm {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 对象字面量批量构造的纯槽写:把值写入键序预建 shape 的 `slot` 槽。
|
||||
/// 不做键解析/`__proto__` 拦截/promote 之外的任何形状变更——键与槽位由
|
||||
/// NEW_OBJECT 的键常量表一次性建好。
|
||||
///
|
||||
/// # 边界与前提
|
||||
/// - `slot` 必须 < NEW_OBJECT 预分配的槽数(emit 保证 ≤255)。
|
||||
/// - 值仍需 promote(对象值可能来自 session epoch 且目标是逃逸根)。
|
||||
fn dispatch_set_prop_batch(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
vm_trace!("SET_PROP_BATCH rd={} slot={}", rd, b);
|
||||
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "Cannot create property on non-object")? else {
|
||||
return Ok(());
|
||||
};
|
||||
let value = self.promote_if_needed_for_write_ptr(obj_ptr, self.regs[a]);
|
||||
let obj = unsafe { &mut *obj_ptr };
|
||||
obj.set_prop_storage(b, value);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
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])?;
|
||||
|
||||
Reference in New Issue
Block a user