From bfa5b2955533a60b2f12e6ac65d4868efcaf5222 Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Mon, 20 Jun 2022 21:33:20 -0700 Subject: Add checks in debug mode that strings being built via counting were actually counted --- src/string_builder.zig | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/string_builder.zig') diff --git a/src/string_builder.zig b/src/string_builder.zig index c3e14fad4..d46b014e2 100644 --- a/src/string_builder.zig +++ b/src/string_builder.zig @@ -3,15 +3,21 @@ const Allocator = @import("std").mem.Allocator; const assert = @import("std").debug.assert; const copy = @import("std").mem.copy; const Env = @import("./env.zig"); - +const bun = @import("./global.zig"); const StringBuilder = @This(); +const DebugHashTable = if (Env.allow_assert) std.AutoHashMapUnmanaged(u64, void) else void; len: usize = 0, cap: usize = 0, ptr: ?[*]u8 = null, +debug_only_checker: DebugHashTable = DebugHashTable{}, + pub fn count(this: *StringBuilder, slice: string) void { this.cap += slice.len; + if (comptime Env.allow_assert) { + _ = this.debug_only_checker.getOrPut(bun.default_allocator, bun.hash(slice)) catch unreachable; + } } pub fn allocate(this: *StringBuilder, allocator: Allocator) !void { @@ -23,15 +29,23 @@ pub fn allocate(this: *StringBuilder, allocator: Allocator) !void { pub fn deinit(this: *StringBuilder, allocator: Allocator) void { if (this.ptr == null or this.cap == 0) return; allocator.free(this.ptr.?[0..this.cap]); + if (comptime Env.allow_assert) { + this.debug_only_checker.deinit(bun.default_allocator); + this.debug_only_checker = .{}; + } } pub fn append(this: *StringBuilder, slice: string) string { - if (Env.allow_assert) { + if (comptime Env.allow_assert) { assert(this.len <= this.cap); // didn't count everything assert(this.ptr != null); // must call allocate first } - copy(u8, this.ptr.?[this.len..this.cap], slice); + if (comptime Env.allow_assert) { + assert(this.debug_only_checker.contains(bun.hash(slice))); + } + + 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; -- cgit v1.2.3