refactor: 退役根重写镜像与对象克隆重写族,保留原地 sweep 弱键定夺

This commit is contained in:
2026-10-02 19:24:56 +00:00
parent 89655f0b7f
commit 43acaacd08
10 changed files with 11 additions and 424 deletions
+4 -116
View File
@@ -1,4 +1,4 @@
//! GC 根遍历与执行期收集钩子:根统一枚举、搬移后指针重写、执行期两档
//! GC 根遍历与执行期收集钩子:根统一枚举、执行期两档
//! 收集入口(安全点门控)与 session GC 账目统计访问器。
use oxide_types::object::{Cell, JsObject, JsString};
@@ -9,10 +9,9 @@ use super::Vm;
use crate::session_gc::SessionGc;
impl Vm {
/// GC 根收集的统一遍历(对象与字符串都产出)。与 `rewrite_values` 字段一一对应。
/// GC 根收集的统一遍历(对象与字符串都产出)。
/// 覆盖执行核心的全部 JsValue 持有点:regs/帧/各栈段/cell/在途异常与完成/
/// 挂起信号/迭代器/微任务/global。新增执行字段必须同时登记在此与
/// `rewrite_values`。
/// 挂起信号/迭代器/微任务/global。
pub(crate) fn for_each_value(&self, mut f: impl FnMut(JsValue)) {
for value in &self.regs {
f(*value);
@@ -106,118 +105,7 @@ impl Vm {
f(JsValue::from_js_object(self.session.global_object().as_ptr() as *mut JsObject));
}
/// GC 指针重写(session 搬移后调用)。与 `for_each_value` 字段一一对应。
#[allow(dead_code)]
pub(crate) fn rewrite_values(&mut self, mut rewrite: impl FnMut(JsValue) -> JsValue) {
for value in &mut self.regs {
*value = rewrite(*value);
}
for frame in &mut self.frames {
frame.saved_this = rewrite(frame.saved_this);
frame.saved_new_target = rewrite(frame.saved_new_target);
frame.callee = rewrite(frame.callee);
frame.constructed_this = frame.constructed_this.map(&mut rewrite);
}
for v in &mut self.save_stack {
*v = rewrite(*v);
}
for v in &mut self.spill_stack {
*v = rewrite(*v);
}
for cell_vec in &mut self.cell_stack {
for &mut cell_ptr in cell_vec.iter_mut() {
if cell_ptr.is_null() {
continue;
}
// SAFETY: cell 经 alloc_cell 独立堆分配,本 session 内指针有效。
let cell = unsafe { &mut *cell_ptr };
cell.value = rewrite(cell.value);
}
}
self.exception_value = self.exception_value.map(&mut rewrite);
self.pending_exception = self.pending_exception.map(&mut rewrite);
self.last_uncaught_value = self.last_uncaught_value.map(&mut rewrite);
self.pending_length_exception = self.pending_length_exception.map(&mut rewrite);
for cached in self.template_objects.values_mut() {
*cached = rewrite(*cached);
}
self.pending_completion = self.pending_completion.map(|completion| match completion {
Completion::Return {
value,
remaining_finally,
for_of_count,
for_in_count,
} => Completion::Return {
value: rewrite(value),
remaining_finally,
for_of_count,
for_in_count,
},
other => other,
});
self.generator_suspended = self.generator_suspended.map(&mut rewrite);
self.delegated_iterator = self.delegated_iterator.map(&mut rewrite);
self.async_context = self.async_context.map(&mut rewrite);
self.async_gen_context = self.async_gen_context.map(&mut rewrite);
// 在途异步逃出的 promise/完成值/剩余迭代器随 sweep 重写(与 mark 段一一对应)。
self.pending_async_escape = self.pending_async_escape.as_mut().map(|pend| {
let completion = match pend.completion {
Completion::Return {
value,
remaining_finally,
for_of_count,
for_in_count,
} => Completion::Return {
value: rewrite(value),
remaining_finally,
for_of_count,
for_in_count,
},
other => other,
};
super::PendingAsyncEscape {
close_promise: rewrite(pend.close_promise),
completion,
remaining: pend.remaining.iter().copied().map(&mut rewrite).collect(),
}
});
self.inline_callee = self.inline_callee.map(&mut rewrite);
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 {
crate::promise::rewrite_job_values(job, &mut rewrite);
}
// Atomics waiter 表中的 promise 随 sweep 重写(与 mark 段一一对应)。
for promises in self.atomics_waiters.values_mut() {
for p in promises {
*p = rewrite(*p);
}
}
for iter in &mut self.iters.for_in_iters {
if iter.is_null() {
continue;
}
// SAFETY: for_in_iters 存放堆上迭代器体,VM 表独占持有。
unsafe {
for (v, _si) in (*(*iter)).keys.iter_mut() {
*v = rewrite(*v);
}
}
}
let global_ptr = self.session.global_object().as_ptr() as *mut JsObject;
if !global_ptr.is_null() {
// SAFETY: KernelSession 在 VM 生命周期内拥有 global_object。
unsafe {
(*global_ptr).rewrite_object_values(rewrite);
}
}
}
/// GC 根统一枚举入口:遍历的字段清单与 `rewrite_values` 一一对应。
/// GC 根统一枚举入口:遍历的字段清单与 `for_each_value` 相同。
pub(crate) fn for_each_root(&self, f: impl FnMut(JsValue)) {
self.for_each_value(f);
}
+1 -1
View File
@@ -359,7 +359,7 @@ pub struct Vm {
/// 标签模板对象缓存(GetTemplateObject):键 = (表代际, 模块 flat_id, site 序号)。
/// 同一代际同 flat_id 同 site 恒返回同一对象;每次 `run()` 清空(缓存只留
/// 本次 run 的条目,规模有界)。键含代际维度后,跨 run 调用旧代模块的
/// flat_id 重编号不再误命中。值为 GC 根(for_each_value/rewrite_values 遍历)。
/// flat_id 重编号不再误命中。值为 GC 根(for_each_value 遍历)。
pub(crate) template_objects: HashMap<(u32, u32, u32), JsValue>,
/// 当前活动字节码所属模块的 flat_id(顶层 0;帧切换时随 bytecode 换)。
/// GET_TEMPLATE_OBJECT 据其区分不同编译树(eval 每次编译独立 site)。