Files
bun.sh/src/string/StringBuilder.zig
pfg 05d0475c6c Update to zig 0.15.2 (#24204)
Fixes ENG-21287

Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`

|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|

Runtime performance:

- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)

Improvements:

- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests

Still an issue:

- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed

Follow-up:

- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully

Files that add lines:

```
649     src/deprecated.zig
167     scripts/pack-codegen-for-zig-team.ts
54      scripts/cleartrace-impl.js
46      scripts/cleartrace.ts
43      src/windows.zig
18      src/fs.zig
17      src/bun.js/ConsoleObject.zig
16      src/output.zig
12      src/bun.js/test/debug.zig
12      src/bun.js/node/node_fs.zig
8       src/env_loader.zig
7       src/css/printer.zig
7       src/cli/init_command.zig
7       src/bun.js/node.zig
6       src/string/escapeRegExp.zig
6       src/install/PnpmMatcher.zig
5       src/bun.js/webcore/Blob.zig
4       src/crash_handler.zig
4       src/bun.zig
3       src/install/lockfile/bun.lock.zig
3       src/cli/update_interactive_command.zig
3       src/cli/pack_command.zig
3       build.zig
2       src/Progress.zig
2       src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2       src/css/small_list.zig
2       src/bun.js/webcore/prompt.zig
1       test/internal/ban-words.test.ts
1       test/internal/ban-limits.json
1       src/watcher/WatcherTrace.zig
1       src/transpiler.zig
1       src/shell/builtin/cp.zig
1       src/js_printer.zig
1       src/io/PipeReader.zig
1       src/install/bin.zig
1       src/css/selectors/selector.zig
1       src/cli/run_command.zig
1       src/bun.js/RuntimeTranspilerStore.zig
1       src/bun.js/bindings/JSRef.zig
1       src/bake/DevServer.zig
```

Files that remove lines:

```
-1      src/test/recover.zig
-1      src/sql/postgres/SocketMonitor.zig
-1      src/sql/mysql/MySQLRequestQueue.zig
-1      src/sourcemap/CodeCoverage.zig
-1      src/css/values/color_js.zig
-1      src/compile_target.zig
-1      src/bundler/linker_context/convertStmtsForChunk.zig
-1      src/bundler/bundle_v2.zig
-1      src/bun.js/webcore/blob/read_file.zig
-1      src/ast/base.zig
-2      src/sql/postgres/protocol/ArrayList.zig
-2      src/shell/builtin/mkdir.zig
-2      src/install/PackageManager/patchPackage.zig
-2      src/install/PackageManager/PackageManagerDirectories.zig
-2      src/fmt.zig
-2      src/css/declaration.zig
-2      src/css/css_parser.zig
-2      src/collections/baby_list.zig
-2      src/bun.js/bindings/ZigStackFrame.zig
-2      src/ast/E.zig
-3      src/StandaloneModuleGraph.zig
-3      src/deps/picohttp.zig
-3      src/deps/libuv.zig
-3      src/btjs.zig
-4      src/threading/Futex.zig
-4      src/shell/builtin/touch.zig
-4      src/meta.zig
-4      src/install/lockfile.zig
-4      src/css/selectors/parser.zig
-5      src/shell/interpreter.zig
-5      src/css/error.zig
-5      src/bun.js/web_worker.zig
-5      src/bun.js.zig
-6      src/cli/test_command.zig
-6      src/bun.js/VirtualMachine.zig
-6      src/bun.js/uuid.zig
-6      src/bun.js/bindings/JSValue.zig
-9      src/bun.js/test/pretty_format.zig
-9      src/bun.js/api/BunObject.zig
-14     src/install/install_binding.zig
-14     src/fd.zig
-14     src/bun.js/node/path.zig
-14     scripts/pack-codegen-for-zig-team.sh
-17     src/bun.js/test/diff_format.zig
```

`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
2025-11-10 14:38:26 -08:00

254 lines
8.0 KiB
Zig

const StringBuilder = @This();
len: usize = 0,
cap: usize = 0,
ptr: ?[*]u8 = null,
pub fn initCapacity(
allocator: std.mem.Allocator,
cap: usize,
) Allocator.Error!StringBuilder {
return StringBuilder{
.cap = cap,
.len = 0,
.ptr = (try allocator.alloc(u8, cap)).ptr,
};
}
pub fn countZ(this: *StringBuilder, slice: []const u8) void {
this.cap += slice.len + 1;
}
pub fn count(this: *StringBuilder, slice: []const u8) void {
this.cap += slice.len;
}
pub fn allocate(this: *StringBuilder, allocator: Allocator) Allocator.Error!void {
const slice = try allocator.alloc(u8, this.cap);
this.ptr = slice.ptr;
this.len = 0;
}
pub fn deinit(this: *StringBuilder, allocator: Allocator) void {
if (this.ptr == null or this.cap == 0) return;
allocator.free(this.ptr.?[0..this.cap]);
}
pub fn count16(this: *StringBuilder, slice: []const u16) void {
const result = bun.simdutf.length.utf8.from.utf16.le(slice);
this.cap += result;
}
pub fn count16Z(this: *StringBuilder, slice: [:0]const u16) void {
const result = bun.strings.elementLengthUTF16IntoUTF8(slice);
this.cap += result + 1;
}
pub fn append16(this: *StringBuilder, slice: []const u16, fallback_allocator: std.mem.Allocator) ?[:0]u8 {
var buf = this.writable();
if (slice.len == 0) {
buf[0] = 0;
this.len += 1;
return buf[0..0 :0];
}
const result = bun.simdutf.convert.utf16.to.utf8.with_errors.le(slice, buf);
if (result.status == .success) {
this.len += result.count + 1;
buf[result.count] = 0;
return buf[0..result.count :0];
} else {
var list = std.array_list.Managed(u8).init(fallback_allocator);
var out = bun.strings.toUTF8ListWithTypeBun(&list, slice, false) catch return null;
out.append(0) catch return null;
return out.items[0 .. out.items.len - 1 :0];
}
}
pub fn appendZ(this: *StringBuilder, slice: []const u8) [:0]const u8 {
if (comptime Environment.allow_assert) {
assert(this.len + 1 <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
bun.copy(u8, this.ptr.?[this.len..this.cap], slice);
this.ptr.?[this.len + slice.len] = 0;
const result = this.ptr.?[this.len..this.cap][0..slice.len :0];
this.len += slice.len + 1;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return result;
}
pub fn appendStr(this: *StringBuilder, str: bun.String) []const u8 {
const slice = str.toUTF8(bun.default_allocator);
defer slice.deinit();
return this.append(slice.slice());
}
pub fn append(this: *StringBuilder, slice: []const u8) []const u8 {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
bun.copy(u8, this.ptr.?[this.len..this.cap], slice);
const result = this.ptr.?[this.len..this.cap][0..slice.len];
this.len += slice.len;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return result;
}
pub fn addConcat(this: *StringBuilder, slices: []const []const u8) bun.StringPointer {
var remain = this.allocatedSlice()[this.len..];
var len: usize = 0;
for (slices) |slice| {
@memcpy(remain[0..slice.len], slice);
remain = remain[slice.len..];
len += slice.len;
}
return this.add(len);
}
pub fn add(this: *StringBuilder, len: usize) bun.StringPointer {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
const start = this.len;
this.len += len;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return bun.StringPointer{ .offset = @as(u32, @truncate(start)), .length = @as(u32, @truncate(len)) };
}
pub fn appendCount(this: *StringBuilder, slice: []const u8) bun.StringPointer {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
const start = this.len;
bun.copy(u8, this.ptr.?[this.len..this.cap], slice);
const result = this.ptr.?[this.len..this.cap][0..slice.len];
_ = result;
this.len += slice.len;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return bun.StringPointer{ .offset = @as(u32, @truncate(start)), .length = @as(u32, @truncate(slice.len)) };
}
pub fn appendCountZ(this: *StringBuilder, slice: []const u8) bun.StringPointer {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
const start = this.len;
bun.copy(u8, this.ptr.?[this.len..this.cap], slice);
this.ptr.?[this.len + slice.len] = 0;
const result = this.ptr.?[this.len..this.cap][0..slice.len];
_ = result;
this.len += slice.len;
this.len += 1;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return bun.StringPointer{ .offset = @as(u32, @truncate(start)), .length = @as(u32, @truncate(slice.len)) };
}
pub fn fmt(this: *StringBuilder, comptime str: []const u8, args: anytype) []const u8 {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
const buf = this.ptr.?[this.len..this.cap];
const out = std.fmt.bufPrint(buf, str, args) catch unreachable;
this.len += out.len;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return out;
}
pub fn fmtAppendCount(this: *StringBuilder, comptime str: []const u8, args: anytype) bun.StringPointer {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
const buf = this.ptr.?[this.len..this.cap];
const out = std.fmt.bufPrint(buf, str, args) catch unreachable;
const off = this.len;
this.len += out.len;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return bun.StringPointer{
.offset = @as(u32, @truncate(off)),
.length = @as(u32, @truncate(out.len)),
};
}
pub fn fmtAppendCountZ(this: *StringBuilder, comptime str: []const u8, args: anytype) bun.StringPointer {
if (comptime Environment.allow_assert) {
assert(this.len <= this.cap); // didn't count everything
assert(this.ptr != null); // must call allocate first
}
const buf = this.ptr.?[this.len..this.cap];
const out = std.fmt.bufPrintZ(buf, str, args) catch unreachable;
const off = this.len;
this.len += out.len;
this.len += 1;
if (comptime Environment.allow_assert) assert(this.len <= this.cap);
return bun.StringPointer{
.offset = @as(u32, @truncate(off)),
.length = @as(u32, @truncate(out.len)),
};
}
pub fn fmtCount(this: *StringBuilder, comptime str: []const u8, args: anytype) void {
this.cap += std.fmt.count(str, args);
}
pub fn allocatedSlice(this: *StringBuilder) []u8 {
var ptr = this.ptr orelse return &[_]u8{};
if (comptime Environment.allow_assert) {
assert(this.cap > 0);
}
return ptr[0..this.cap];
}
pub fn writable(this: *StringBuilder) []u8 {
var ptr = this.ptr orelse return &[_]u8{};
if (comptime Environment.allow_assert) {
assert(this.cap > 0);
}
return ptr[this.len..this.cap];
}
/// Transfer ownership of the underlying memory to a slice.
///
/// After calling this, you are responsible for freeing the underlying memory.
/// This StringBuilder should not be used after calling this function.
pub fn moveToSlice(this: *StringBuilder, into_slice: *[]u8) void {
into_slice.* = this.allocatedSlice();
this.* = .{};
}
const std = @import("std");
const Allocator = std.mem.Allocator;
const bun = @import("bun");
const Environment = bun.Environment;
const assert = bun.assert;