mirror of
https://github.com/pjh456/OxideJS.git
synced 2026-10-24 10:41:11 +08:00
perf: for-of 内置迭代器快路径直步,跳过 native 调用帧
This commit is contained in:
@@ -117,6 +117,8 @@ fn gc_roots_contains_registers_frames_and_root_roots() {
|
||||
iterator: JsValue::from_js_object(child_session),
|
||||
last_result: JsValue::from_js_object(root_session),
|
||||
is_async: false,
|
||||
fast: None,
|
||||
fast_value: JsValue::undefined(),
|
||||
});
|
||||
|
||||
let mut roots = Vec::new();
|
||||
|
||||
@@ -194,6 +194,7 @@ impl SuspendedFrame {
|
||||
for entry in &self.for_of_iters {
|
||||
f(entry.iterator);
|
||||
f(entry.last_result);
|
||||
f(entry.fast_value);
|
||||
}
|
||||
if let Some(it) = self.delegated_iterator {
|
||||
f(it);
|
||||
@@ -248,6 +249,7 @@ impl SuspendedFrame {
|
||||
for entry in &mut self.for_of_iters {
|
||||
entry.iterator = rewrite(entry.iterator);
|
||||
entry.last_result = rewrite(entry.last_result);
|
||||
entry.fast_value = rewrite(entry.fast_value);
|
||||
}
|
||||
self.delegated_iterator = self.delegated_iterator.map(&mut rewrite);
|
||||
self.exception_value = self.exception_value.map(&mut rewrite);
|
||||
@@ -324,6 +326,8 @@ impl SuspendedFrame {
|
||||
iterator: rewrite(entry.iterator),
|
||||
last_result: rewrite(entry.last_result),
|
||||
is_async: entry.is_async,
|
||||
fast: entry.fast,
|
||||
fast_value: rewrite(entry.fast_value),
|
||||
})
|
||||
.collect(),
|
||||
delegated_iterator: self.delegated_iterator.map(&mut rewrite),
|
||||
@@ -413,6 +417,8 @@ mod tests {
|
||||
iterator: JsValue::float(6.0),
|
||||
last_result: JsValue::float(7.0),
|
||||
is_async: false,
|
||||
fast: None,
|
||||
fast_value: JsValue::undefined(),
|
||||
});
|
||||
frame.delegated_iterator = Some(JsValue::float(8.0));
|
||||
frame.saved_bytecode_stack.push(Arc::from(vec![0u32]));
|
||||
|
||||
@@ -70,6 +70,7 @@ impl Vm {
|
||||
for &entry in &self.iters.for_of_iters {
|
||||
f(entry.iterator);
|
||||
f(entry.last_result);
|
||||
f(entry.fast_value);
|
||||
}
|
||||
// 微任务队列中的处理器/能力/值都是 GC 根。
|
||||
for job in &self.job_queue {
|
||||
@@ -151,6 +152,7 @@ impl Vm {
|
||||
for entry in &mut self.iters.for_of_iters {
|
||||
entry.iterator = rewrite(entry.iterator);
|
||||
entry.last_result = rewrite(entry.last_result);
|
||||
entry.fast_value = rewrite(entry.fast_value);
|
||||
}
|
||||
// 微任务队列中的值随 sweep 重写。
|
||||
for job in &mut self.job_queue {
|
||||
|
||||
@@ -641,7 +641,9 @@ impl Vm {
|
||||
let iterable = self.regs[a];
|
||||
match oxide_builtins::iterator::make_iterator_for_value(self, iterable) {
|
||||
Ok(iterator) => {
|
||||
self.iters.push_for_of(iterator, false);
|
||||
// 内置包装器检测:Array/String/TA/Map/Set 走快路径(异步恒慢)。
|
||||
let kind = oxide_builtins::iterator::builtin_iter_kind(self, iterator);
|
||||
self.iters.push_for_of(iterator, false, kind);
|
||||
Ok(())
|
||||
}
|
||||
Err(err) => {
|
||||
@@ -659,7 +661,7 @@ impl Vm {
|
||||
let iterable = self.regs[a];
|
||||
match crate::async_from_sync::make_async_iterator(self, iterable) {
|
||||
Ok(iterator) => {
|
||||
self.iters.push_for_of(iterator, true);
|
||||
self.iters.push_for_of(iterator, true, None);
|
||||
Ok(())
|
||||
}
|
||||
Err(err) => {
|
||||
@@ -762,6 +764,33 @@ impl Vm {
|
||||
|
||||
// 调用 next()/读 done 前清空异常值槽:跨调用残留不得污染本指令的取槽。
|
||||
self.last_uncaught_value = None;
|
||||
|
||||
// 快路径:内置包装器(Array/String/TA/Map/Set)直步,跳过 native 调用帧、
|
||||
// 结果对象分配与 done/value 两次读;kind 失配清标志,本迭代回落慢路径。
|
||||
let fast_kind = self.iters.for_of_iters.last().and_then(|e| e.fast);
|
||||
if let Some(kind) = fast_kind {
|
||||
// SAFETY: iterator 刚判定为对象。
|
||||
let iter_obj = unsafe { &mut *iterator.as_js_object_ptr() };
|
||||
let step = oxide_builtins::iterator::builtin_iter_fast_step(self, iter_obj, kind);
|
||||
// 元素 getter / __inner__ 访问器抛出:深度 0 的 raise_call_error 已就地
|
||||
// unwind(跳转 catch),条目已弹出、异常值已入异常通道——直接返回,
|
||||
// 派发循环自 catch 点续行,不得再触碰迭代器栈。
|
||||
if !self.iters.for_of_iters.last().is_some_and(|e| e.iterator == iterator) {
|
||||
return Ok(());
|
||||
}
|
||||
match step {
|
||||
Ok(Some((value, done))) => {
|
||||
self.iters.for_of_iters.last_mut().unwrap().fast_value = value;
|
||||
self.regs[rd] = JsValue::bool(!done);
|
||||
}
|
||||
Ok(None) => {
|
||||
self.iters.for_of_iters.last_mut().unwrap().fast = None;
|
||||
}
|
||||
Err(exc) => return self.throw_for_of_error_value(exc),
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let iter_obj = unsafe { &*iterator.as_js_object_ptr() };
|
||||
let next_si = self.kernel_core.perm_interner().intern("next").0;
|
||||
let next_fn = match self.ordinary_get(iter_obj, next_si, iterator) {
|
||||
@@ -792,6 +821,11 @@ impl Vm {
|
||||
pub(crate) fn dispatch_for_of_next(&mut self, rd: usize) -> Result<(), String> {
|
||||
vm_trace!("FOR_OF_NEXT rd={}", rd);
|
||||
self.last_uncaught_value = None;
|
||||
// 快路径:元素值由前一次 DONE 快步产出,直写寄存器。
|
||||
if self.iters.for_of_iters.last().is_some_and(|e| e.fast.is_some()) {
|
||||
self.regs[rd] = self.iters.for_of_iters.last().unwrap().fast_value;
|
||||
return Ok(());
|
||||
}
|
||||
let result = self.iters.last_result();
|
||||
if !result.is_object() {
|
||||
self.regs[rd] = JsValue::undefined();
|
||||
@@ -811,11 +845,16 @@ impl Vm {
|
||||
/// 重新抛出原始值。按 ECMA-262,next() 抛出时不会经 return() 关闭迭代器——
|
||||
/// 先弹出它,使展开时的 IteratorClose 遍历跳过该迭代器。
|
||||
fn throw_for_of_error(&mut self, msg: String) -> Result<(), String> {
|
||||
self.iters.pop_for_of();
|
||||
let exc = match self.last_uncaught_value.take() {
|
||||
Some(v) => v,
|
||||
None => oxide_builtins::error::create_from_text(self, &msg),
|
||||
};
|
||||
self.throw_for_of_error_value(exc)
|
||||
}
|
||||
|
||||
/// 以指定异常值展开(慢路径文本重建与快路径原值透传共用)。
|
||||
fn throw_for_of_error_value(&mut self, exc: JsValue) -> Result<(), String> {
|
||||
self.iters.pop_for_of();
|
||||
self.exception_value = Some(exc);
|
||||
self.pending_error_kind = Some(self.thrown_error_kind(exc));
|
||||
// 无论取到原值还是重建错误对象,异常必须展开传播,不得静默返回 Ok——
|
||||
@@ -1234,6 +1273,8 @@ mod tests {
|
||||
iterator: JsValue::undefined(),
|
||||
last_result: JsValue::undefined(),
|
||||
is_async: false,
|
||||
fast: None,
|
||||
fast_value: JsValue::undefined(),
|
||||
});
|
||||
|
||||
vm.run(&Arc::new(module))
|
||||
|
||||
@@ -828,6 +828,8 @@ mod tests {
|
||||
iterator: JsValue::float(8.5),
|
||||
last_result: JsValue::float(9.0),
|
||||
is_async: false,
|
||||
fast: None,
|
||||
fast_value: JsValue::undefined(),
|
||||
});
|
||||
vm.spill_stack.push(JsValue::float(10.0));
|
||||
vm.save_stack.push(JsValue::float(11.0));
|
||||
|
||||
@@ -15,6 +15,7 @@ use rustc_hash::FxBuildHasher;
|
||||
|
||||
use crate::session_gc::SessionGc;
|
||||
use crate::vm::ForInIter;
|
||||
use oxide_builtins::iterator::BuiltinIterKind;
|
||||
use oxide_types::object::{Cell as UpvalueCell, JsObject, JsString};
|
||||
use oxide_types::private_key::WELL_KNOWN_SYMBOL_COUNT;
|
||||
use oxide_types::value::JsValue;
|
||||
@@ -165,6 +166,11 @@ pub(crate) struct ForOfEntry {
|
||||
/// promise(独立异步机制),同步逃出路径(break/continue/return 计数关闭)
|
||||
/// 不得同步调用其 return()。
|
||||
pub(crate) is_async: bool,
|
||||
/// 内置包装器快路径:迭代器为 Array/String/TA/Map/Set 内置包装器时非 None,
|
||||
/// DONE/NEXT 直步不经 native 调用;kind 失配清标志回落慢路径。
|
||||
pub(crate) fast: Option<BuiltinIterKind>,
|
||||
/// 快路径本迭代产出的元素值(仅 DONE→NEXT 之间有效,不跨迭代)。
|
||||
pub(crate) fast_value: JsValue,
|
||||
}
|
||||
|
||||
/// for-in / for-of 的活跃迭代器状态。
|
||||
@@ -192,12 +198,15 @@ impl IterState {
|
||||
}
|
||||
|
||||
/// 压入新迭代器条目:`last_result` 初始为 undefined(尚未执行任何 next())。
|
||||
/// `is_async` 标记 for-await-of 的异步迭代器(异步逃出关闭走独立机制)。
|
||||
pub(crate) fn push_for_of(&mut self, iterator: JsValue, is_async: bool) {
|
||||
/// `is_async` 标记 for-await-of 的异步迭代器(异步逃出关闭走独立机制);
|
||||
/// `fast` 为内置包装器种类(None = 慢路径)。
|
||||
pub(crate) fn push_for_of(&mut self, iterator: JsValue, is_async: bool, fast: Option<BuiltinIterKind>) {
|
||||
self.for_of_iters.push(ForOfEntry {
|
||||
iterator,
|
||||
last_result: JsValue::undefined(),
|
||||
is_async,
|
||||
fast,
|
||||
fast_value: JsValue::undefined(),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -853,6 +853,8 @@ fn reset_clears_runtime_state_like_rerun() {
|
||||
iterator: JsValue::undefined(),
|
||||
last_result: JsValue::undefined(),
|
||||
is_async: false,
|
||||
fast: None,
|
||||
fast_value: JsValue::undefined(),
|
||||
});
|
||||
vm.saved_bytecode_stack.push(Arc::from(vec![oxide_bytecode::opcode::encode(
|
||||
oxide_bytecode::opcode::OpCode::HALT,
|
||||
|
||||
Reference in New Issue
Block a user