ITStudio_OUC/OxideJS
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(vm): REST_OBJECT 提前消费 ext 字防 ToObject 早返回后 pc 错位

Browse Source
This commit is contained in:
爱特每羊队
2026-08-07 18:00:59 +08:00
parent 3dee6fa21c
commit 33690fb803
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/vm_dispatch_misc.rs
+4 -2
View File
@@ -561,6 +561,10 @@ impl Vm {
pub(crate) fn dispatch_rest_object(&mut self, rd: usize, a: usize) -> Result<(), String> { pub(crate) fn dispatch_rest_object(&mut self, rd: usize, a: usize) -> Result<(), String> {
vm_trace!("REST_OBJECT rd={}", rd); vm_trace!("REST_OBJECT rd={}", rd);
// ext 字（excluded 常量下标）在任何路径都先消费，防止 ToObject 早返回后
// pc 错位把 ext 字当下一条指令解码（曾误读成 UNSPILL slot）。
let excluded_idx = self.bytecode[self.pc] as usize;
self.pc += 1;
let src = self.regs[a]; let src = self.regs[a];
if !src.is_object() { if !src.is_object() {
// ToObject：null/undefined 抛；number/boolean/symbol 无自有属性 → 空对象； // ToObject：null/undefined 抛；number/boolean/symbol 无自有属性 → 空对象；
@@ -586,8 +590,6 @@ impl Vm {
self.regs[rd] = JsValue::from_js_object(rest_ptr); self.regs[rd] = JsValue::from_js_object(rest_ptr);
return Ok(()); return Ok(());
} }
let excluded_idx = self.bytecode[self.pc] as usize;
self.pc += 1;
let excluded = self let excluded = self
.immutables() .immutables()
.get(excluded_idx) .get(excluded_idx)