fix: builtins 对象分配统一走 alloc_object 登记消除高频路径泄漏

This commit is contained in:
2026-08-16 03:36:02 +08:00
parent 63ccb0fcf3
commit 1a2d8682ae
5 changed files with 101 additions and 19 deletions
+2 -6
View File
@@ -40,9 +40,7 @@ pub fn create_kind_error<H: VmHost>(host: &mut H, kind: &str, msg: &str) -> JsVa
"EvalError" => P::as_ptr(&host.session().builtin_world().eval_error_proto) as *mut JsObject, "EvalError" => P::as_ptr(&host.session().builtin_world().eval_error_proto) as *mut JsObject,
_ => P::as_ptr(&host.session().builtin_world().error_proto) as *mut JsObject, _ => P::as_ptr(&host.session().builtin_world().error_proto) as *mut JsObject,
}; };
let obj = host let obj = host.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto_ptr)));
.epoch()
.alloc(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto_ptr)));
let sf = Arc::clone(host.kernel_core().perm_interner()); let sf = Arc::clone(host.kernel_core().perm_interner());
let sh = Arc::clone(host.kernel_core().shape_forge()); let sh = Arc::clone(host.kernel_core().shape_forge());
if !msg.is_empty() { if !msg.is_empty() {
@@ -129,9 +127,7 @@ macro_rules! error_ctor {
/// 忽略调用方传入的 this——与规范构造器语义一致。 /// 忽略调用方传入的 this——与规范构造器语义一致。
pub fn $name<H: VmHost>(host: &mut H, args: &[u8]) -> NativeResult { pub fn $name<H: VmHost>(host: &mut H, args: &[u8]) -> NativeResult {
let proto_ptr = P::as_ptr(&host.session().builtin_world().$proto_field) as *mut JsObject; let proto_ptr = P::as_ptr(&host.session().builtin_world().$proto_field) as *mut JsObject;
let this = host let this = host.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto_ptr)));
.epoch()
.alloc(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto_ptr)));
set_own_message(host, this, args); set_own_message(host, this, args);
NativeResult::Ok(JsValue::from_js_object(this)) NativeResult::Ok(JsValue::from_js_object(this))
} }
+1 -3
View File
@@ -717,9 +717,7 @@ pub fn object_get_own_property_descriptor<H: VmHost>(vm: &mut H, args: &[u8]) ->
let sf_ptr = vm.kernel_core().perm_interner().as_ref() as *const PermInterner; let sf_ptr = vm.kernel_core().perm_interner().as_ref() as *const PermInterner;
let sh_ptr = vm.kernel_core().shape_forge().as_ref() as *const ShapeForge; let sh_ptr = vm.kernel_core().shape_forge().as_ref() as *const ShapeForge;
let desc_proto = vm.session().builtin_world().object_proto.as_ptr() as *mut JsObject; let desc_proto = vm.session().builtin_world().object_proto.as_ptr() as *mut JsObject;
let desc = vm let desc = vm.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(desc_proto)));
.epoch()
.alloc(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(desc_proto)));
let sf = unsafe { &*sf_ptr }; let sf = unsafe { &*sf_ptr };
let sh = unsafe { &*sh_ptr }; let sh = unsafe { &*sh_ptr };
+1 -2
View File
@@ -245,8 +245,7 @@ pub fn regexp_exec<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let n = 1 + group_count; let n = 1 + group_count;
let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject; let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject;
let arr = let arr =
vm.epoch() vm.alloc_object(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(proto), n, vm.epoch().bump()));
.alloc(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(proto), n, vm.epoch().bump()));
unsafe { unsafe {
(*arr).set_prop_at(0, vm.new_string(&haystack[range.start..range.end])); (*arr).set_prop_at(0, vm.new_string(&haystack[range.start..range.end]));
// 捕获组:未参与匹配的组为 undefined。 // 捕获组:未参与匹配的组为 undefined。
+2 -4
View File
@@ -192,8 +192,7 @@ pub(crate) fn make_string_array<H: VmHost>(vm: &mut H, parts: Vec<String>) -> Js
let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject; let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject;
let n = parts.len(); let n = parts.len();
let arr = let arr =
vm.epoch() vm.alloc_object(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(proto), n, vm.epoch().bump()));
.alloc(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(proto), n, vm.epoch().bump()));
unsafe { unsafe {
for (i, s) in parts.into_iter().enumerate() { for (i, s) in parts.into_iter().enumerate() {
let sv = vm.new_string_owned(s); let sv = vm.new_string_owned(s);
@@ -210,8 +209,7 @@ pub(crate) fn make_string_array_values<H: VmHost>(vm: &mut H, parts: Vec<JsValue
let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject; let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject;
let n = parts.len(); let n = parts.len();
let arr = let arr =
vm.epoch() vm.alloc_object(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(proto), n, vm.epoch().bump()));
.alloc(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(proto), n, vm.epoch().bump()));
unsafe { unsafe {
for (i, sv) in parts.into_iter().enumerate() { for (i, sv) in parts.into_iter().enumerate() {
(*arr).set_prop_at(i, sv); (*arr).set_prop_at(i, sv);
+95 -4
View File
@@ -127,8 +127,99 @@ fn new_object_literal_freed_by_full_reset() {
vm.full_reset(); vm.full_reset();
assert_eq!(vm.epoch_object_count(), 0, "full_reset 后 epoch 追踪表应清空"); assert_eq!(vm.epoch_object_count(), 0, "full_reset 后 epoch 追踪表应清空");
assert_eq!(vm.session_object_count(), 0, "full_reset 后 session 追踪表应清空"); assert_eq!(vm.session_object_count(), 0, "full_reset 后 session 追踪表应清空");
assert!( assert!(run_source(&mut vm, "globalThis.keep").is_undefined(), "full_reset 后逃逸对象不可再访问");
run_source(&mut vm, "globalThis.keep").is_undefined(), }
"full_reset 后逃逸对象不可再访问"
); /// regexp exec 结果数组必须登记 epoch 追踪表:数组元素区 Box 与 index/input 命名
/// 属性 hash_props Box 随 reset 统一释放;未登记则每次 exec/Symbol.match 泄漏。
#[test]
fn regexp_exec_result_array_tracked_and_freed_on_reset() {
let mut vm = Vm::new();
let result = run_source(
&mut vm,
"for (var i = 0; i < 20; i++) { /a(b)?/.exec('ab'); } \
var r = /a(b)?/.exec('ab'); r.length",
);
assert_eq!(format!("{}", result), "2", "exec 结果数组长度应正常");
assert!(vm.epoch_object_count() > 0, "exec 结果数组应登记 epoch 追踪表");
let freed_before = vm.session_gc_stats().total_bytes_freed;
vm.reset();
assert!(
vm.session_gc_stats().total_bytes_freed > freed_before,
"reset 应释放 exec 结果数组的元素区与命名属性堆数据"
);
assert_eq!(vm.epoch_object_count(), 0, "reset 后追踪表应清空");
}
/// split/match 结果数组必须登记 epoch 追踪表:元素区 Box 随 reset 统一释放;
/// 未登记则每次 split/match 泄漏一个 Box。
#[test]
fn string_split_match_result_array_tracked_and_freed_on_reset() {
let mut vm = Vm::new();
let result = run_source(
&mut vm,
"for (var i = 0; i < 20; i++) { 'a,b,c'.split(','); 'ab'.match(/a/); } \
'a,b,c'.split(',').length",
);
assert_eq!(format!("{}", result), "3", "split 结果数组长度应正常");
assert!(vm.epoch_object_count() > 0, "split/match 结果数组应登记 epoch 追踪表");
let freed_before = vm.session_gc_stats().total_bytes_freed;
vm.reset();
assert!(
vm.session_gc_stats().total_bytes_freed > freed_before,
"reset 应释放 split/match 结果数组的元素区堆数据"
);
assert_eq!(vm.epoch_object_count(), 0, "reset 后追踪表应清空");
}
/// 错误对象必须登记 epoch 追踪表:message 非空时 push_prop 分配 hash_props Box,
/// 随 reset 统一释放;未登记则每次抛错(全引擎最频繁路径)泄漏一个 Box。
/// 同时覆盖构造器路径(`new TypeError`)与内部抛错路径(builtin 内 create_type_error)。
#[test]
fn error_object_tracked_and_freed_on_reset() {
let mut vm = Vm::new();
let result = run_source(
&mut vm,
"for (var i = 0; i < 20; i++) { \
try { throw new TypeError('boom'); } catch (e) {} \
try { Error.prototype.toString.call(1); } catch (e) {} \
} \
try { throw new TypeError('boom'); } catch (e) { e.message }",
);
assert_eq!(vm.lookup_str(result).unwrap_or_default(), "boom", "错误对象 message 应正常");
assert!(vm.epoch_object_count() > 0, "错误对象应登记 epoch 追踪表");
let freed_before = vm.session_gc_stats().total_bytes_freed;
vm.reset();
assert!(
vm.session_gc_stats().total_bytes_freed > freed_before,
"reset 应释放错误对象的 message 属性堆数据"
);
assert_eq!(vm.epoch_object_count(), 0, "reset 后追踪表应清空");
}
/// gOPD/Reflect 描述符对象必须登记 epoch 追踪表:4 个描述符属性 push 分配
/// hash_props Box,随 reset 统一释放;未登记则每次 getOwnPropertyDescriptor 泄漏。
#[test]
fn gopd_descriptor_tracked_and_freed_on_reset() {
let mut vm = Vm::new();
let result = run_source(
&mut vm,
"for (var i = 0; i < 20; i++) { \
Object.getOwnPropertyDescriptor({x:1,y:2,z:3,w:4}, 'x'); \
} \
Object.getOwnPropertyDescriptor({x:5}, 'x').value",
);
assert_eq!(format!("{}", result), "5", "gOPD 描述符值应正常");
assert!(vm.epoch_object_count() > 0, "描述符对象应登记 epoch 追踪表");
let freed_before = vm.session_gc_stats().total_bytes_freed;
vm.reset();
assert!(
vm.session_gc_stats().total_bytes_freed > freed_before,
"reset 应释放描述符对象的 hash_props 堆数据"
);
assert_eq!(vm.epoch_object_count(), 0, "reset 后追踪表应清空");
} }