mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 18:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix under-reporting string memory usage to GC (#16426)

Browse Source
This commit is contained in:
Jarred Sumner
2025-01-15 23:45:33 -08:00
committed by GitHub
parent 4ac4d5e4e5
commit a2f1a87f0d
14 changed files with 113 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/string.zig
View File

@@ -342,11 +342,10 @@ pub const String = extern struct {
if (this.tag == .WTFStringImpl) this.value.WTFStringImpl.ensureHash();
}
extern fn BunString__transferToJS(this: *String, globalThis: *JSC.JSGlobalObject) JSC.JSValue;
pub fn transferToJS(this: *String, globalThis: *JSC.JSGlobalObject) JSC.JSValue {
const js_value = this.toJS(globalThis);
this.deref();
this.* = dead;
return js_value;
JSC.markBinding(@src());
return BunString__transferToJS(this, globalThis);
}
pub fn toOwnedSlice(this: String, allocator: std.mem.Allocator) ![]u8 {
@@ -1069,6 +1068,12 @@ pub const String = extern struct {
extern fn Bun__parseDate(*JSC.JSGlobalObject, *String) f64;
extern fn BunString__fromJSRef(globalObject: *JSC.JSGlobalObject, value: bun.JSC.JSValue, out: *String) bool;
extern fn BunString__toWTFString(this: *String) void;
extern fn BunString__createUTF8ForJS(globalObject: *JSC.JSGlobalObject, ptr: [*]const u8, len: usize) JSC.JSValue;
pub fn createUTF8ForJS(globalObject: *JSC.JSGlobalObject, utf8_slice: []const u8) JSC.JSValue {
JSC.markBinding(@src());
return BunString__createUTF8ForJS(globalObject, utf8_slice.ptr, utf8_slice.len);
}
pub fn parseDate(this: *String, globalObject: *JSC.JSGlobalObject) f64 {
JSC.markBinding(@src());
@@ -1466,6 +1471,14 @@ pub const SliceWithUnderlyingString = struct {
}
pub fn toJS(this: *SliceWithUnderlyingString, globalObject: *JSC.JSGlobalObject) JSC.JSValue {
return this.toJSWithOptions(globalObject, false);
}
pub fn transferToJS(this: *SliceWithUnderlyingString, globalObject: *JSC.JSGlobalObject) JSC.JSValue {
return this.toJSWithOptions(globalObject, true);
}
fn toJSWithOptions(this: *SliceWithUnderlyingString, globalObject: *JSC.JSGlobalObject, transfer: bool) JSC.JSValue {
if ((this.underlying.tag == .Dead or this.underlying.tag == .Empty) and this.utf8.length() > 0) {
if (comptime bun.Environment.allow_assert) {
if (this.utf8.allocator.get()) |allocator| {
@@ -1487,12 +1500,23 @@ pub const SliceWithUnderlyingString = struct {
}
}
const out = bun.String.createUTF8(this.utf8.slice());
defer out.deref();
return out.toJS(globalObject);
defer {
if (transfer) {
this.utf8.deinit();
this.utf8 = .{};
}
}
return String.createUTF8ForJS(globalObject, this.utf8.slice());
}
return this.underlying.toJS(globalObject);
if (transfer) {
this.utf8.deinit();
this.utf8 = .{};
return this.underlying.transferToJS(globalObject);
} else {
return this.underlying.toJS(globalObject);
}
}
};