Commit 7de67e6802d4cec114d5ede1892abe428e331cac | zig

author	Jacob Young <jacobly@ziglang.org> 2025-10-04 05:05:31-04:00
committer	Jacob Young <jacobly@ziglang.org> 2025-10-05 00:27:39-04:00
log	7de67e6802d4cec114d5ede1892abe428e331cac
tree	45371f4ba0d7dd52d80e611e40c7262e8240a95a
parent	2700af2aeb804c332fe11c9c26116769e78c3dbd

InternPool: use sequential string indices instead of byte offsets

This allows more bytes to be referenced by a smaller index range.

Closes #22867
Closes #25297
Closes #25339

5 files changed, 102 insertions(+), 63 deletions(-)

src/Compilation.zig+7-2

src/InternPool.zig+82-48

 @@ -182,7 +182,7 @@ pub const TrackedInst = extern struct {
             pub fn wrap(unwrapped: Unwrapped, ip: *const InternPool) TrackedInst.Index {
                 assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
                 assert(unwrapped.index <= ip.getIndexMask(u32));
-                return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 |
+                return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
                     unwrapped.index);
             }
         };
 @@ -480,7 +480,7 @@ pub const ComptimeUnit = extern struct {
             fn wrap(unwrapped: Unwrapped, ip: *const InternPool) ComptimeUnit.Id {
                 assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
                 assert(unwrapped.index <= ip.getIndexMask(u32));
-                return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 |
+                return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
                     unwrapped.index);
             }
         };
 @@ -699,7 +699,7 @@ pub const Nav = struct {
             fn wrap(unwrapped: Unwrapped, ip: *const InternPool) Nav.Index {
                 assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
                 assert(unwrapped.index <= ip.getIndexMask(u32));
-                return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 |
+                return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
                     unwrapped.index);
             }
         };
 @@ -1047,6 +1047,7 @@ const Local = struct {
         extra: ListMutate,
         limbs: ListMutate,
         strings: ListMutate,
+        string_bytes: ListMutate,
         tracked_insts: ListMutate,
         files: ListMutate,
         maps: ListMutate,
 @@ -1061,6 +1062,7 @@ const Local = struct {
         extra: Extra,
         limbs: Limbs,
         strings: Strings,
+        string_bytes: StringBytes,
         tracked_insts: TrackedInsts,
         files: List(File),
         maps: Maps,
 @@ -1084,7 +1086,8 @@ const Local = struct {
         @sizeOf(u64) => List(struct { u64 }),
         else => @compileError("unsupported host"),
     };
-    const Strings = List(struct { u8 });
+    const Strings = List(struct { u32 });
+    const StringBytes = List(struct { u8 });
     const TrackedInsts = List(struct { TrackedInst.MaybeLost });
     const Maps = List(struct { FieldMap });
     const Navs = List(Nav.Repr);
 @@ -1414,17 +1417,27 @@ const Local = struct {
         };
     }
+    /// A list of offsets into `string_bytes` for each string.
+    pub fn getMutableStrings(local: *Local, gpa: Allocator) Strings.Mutable {
+        return .{
+            .gpa = gpa,
+            .arena = &local.mutate.arena,
+            .mutate = &local.mutate.strings,
+            .list = &local.shared.strings,
+        };
+    }
     /// In order to store references to strings in fewer bytes, we copy all
     /// string bytes into here. String bytes can be null. It is up to whomever
     /// is referencing the data here whether they want to store both index and length,
     /// thus allowing null bytes, or store only index, and use null-termination. The
-    /// `strings` array is agnostic to either usage.
+    /// `strings_bytes` array is agnostic to either usage.
-    pub fn getMutableStrings(local: *Local, gpa: Allocator) Strings.Mutable {
+    pub fn getMutableStringBytes(local: *Local, gpa: Allocator) StringBytes.Mutable {
         return .{
             .gpa = gpa,
             .arena = &local.mutate.arena,
-            .mutate = &local.mutate.strings,
+            .mutate = &local.mutate.string_bytes,
-            .list = &local.shared.strings,
+            .list = &local.shared.string_bytes,
         };
     }
 @@ -1597,7 +1610,7 @@ const Shard = struct {
 };
 fn getTidMask(ip: *const InternPool) u32 {
-    return (@as(u32, 1) << ip.tid_width) - 1;
+    return @shlExact(@as(u32, 1), ip.tid_width) - 1;
 }
 fn getIndexMask(ip: *const InternPool, comptime BackingInt: type) u32 {
 @@ -1652,7 +1665,7 @@ pub const MapIndex = enum(u32) {
         fn wrap(unwrapped: Unwrapped, ip: *const InternPool) MapIndex {
             assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
             assert(unwrapped.index <= ip.getIndexMask(u32));
-            return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 |
+            return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
                 unwrapped.index);
         }
     };
 @@ -1678,7 +1691,7 @@ pub const NamespaceIndex = enum(u32) {
             assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
             assert(unwrapped.bucket_index <= ip.getIndexMask(u32) >> Local.namespaces_bucket_width);
             assert(unwrapped.index <= Local.namespaces_bucket_mask);
-            return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 |
+            return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
                 unwrapped.bucket_index << Local.namespaces_bucket_width |
                 unwrapped.index);
         }
 @@ -1721,7 +1734,7 @@ pub const FileIndex = enum(u32) {
         fn wrap(unwrapped: Unwrapped, ip: *const InternPool) FileIndex {
             assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
             assert(unwrapped.index <= ip.getIndexMask(u32));
-            return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 |
+            return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
                 unwrapped.index);
         }
     };
 @@ -1780,7 +1793,8 @@ pub const String = enum(u32) {
         fn wrap(unwrapped: Unwrapped, ip: *const InternPool) String {
             assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
             assert(unwrapped.index <= ip.getIndexMask(u32));
-            return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_32 | unwrapped.index);
+            return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_32) |
+                unwrapped.index);
         }
     };
     fn unwrap(string: String, ip: *const InternPool) Unwrapped {
 @@ -1791,9 +1805,11 @@ pub const String = enum(u32) {
     }
     fn toOverlongSlice(string: String, ip: *const InternPool) []const u8 {
-        const unwrapped_string = string.unwrap(ip);
+        const unwrapped = string.unwrap(ip);
-        const strings = ip.getLocalShared(unwrapped_string.tid).strings.acquire();
+        const local_shared = ip.getLocalShared(unwrapped.tid);
-        return strings.view().items(.@"0")[unwrapped_string.index..];
+        const strings = local_shared.strings.acquire().view().items(.@"0");
+        const string_bytes = local_shared.string_bytes.acquire().view().items(.@"0");
+        return string_bytes[strings[unwrapped.index]..];
     }
     const debug_state = InternPool.debug_state;
 @@ -1848,12 +1864,18 @@ pub const NullTerminatedString = enum(u32) {
     }
     pub fn toSlice(string: NullTerminatedString, ip: *const InternPool) [:0]const u8 {
-        const overlong_slice = string.toString().toOverlongSlice(ip);
+        const unwrapped = string.toString().unwrap(ip);
-        return overlong_slice[0..std.mem.indexOfScalar(u8, overlong_slice, 0).? :0];
+        const local_shared = ip.getLocalShared(unwrapped.tid);
+        const strings = local_shared.strings.acquire().view().items(.@"0");
+        const string_bytes = local_shared.string_bytes.acquire().view().items(.@"0");
+        return string_bytes[strings[unwrapped.index] .. strings[unwrapped.index + 1] - 1 :0];
     }
     pub fn length(string: NullTerminatedString, ip: *const InternPool) u32 {
-        return @intCast(string.toSlice(ip).len);
+        const unwrapped = string.toString().unwrap(ip);
+        const local_shared = ip.getLocalShared(unwrapped.tid);
+        const strings = local_shared.strings.acquire().view().items(.@"0");
+        return strings[unwrapped.index + 1] - 1 - strings[unwrapped.index];
     }
     pub fn eqlSlice(string: NullTerminatedString, slice: []const u8, ip: *const InternPool) bool {
 @@ -4767,7 +4789,8 @@ pub const Index = enum(u32) {
         fn wrap(unwrapped: Unwrapped, ip: *const InternPool) Index {
             assert(@intFromEnum(unwrapped.tid) <= ip.getTidMask());
             assert(unwrapped.index <= ip.getIndexMask(u30));
-            return @enumFromInt(@as(u32, @intFromEnum(unwrapped.tid)) << ip.tid_shift_30 | unwrapped.index);
+            return @enumFromInt(@shlExact(@as(u32, @intFromEnum(unwrapped.tid)), ip.tid_shift_30) |
+                unwrapped.index);
         }
         pub fn getExtra(unwrapped: Unwrapped, ip: *const InternPool) Local.Extra {
 @@ -6784,6 +6807,7 @@ pub fn init(ip: *InternPool, gpa: Allocator, available_threads: usize) !void {
             .extra = .empty,
             .limbs = .empty,
             .strings = .empty,
+            .string_bytes = .empty,
             .tracked_insts = .empty,
             .files = .empty,
             .maps = .empty,
 @@ -6799,6 +6823,7 @@ pub fn init(ip: *InternPool, gpa: Allocator, available_threads: usize) !void {
             .extra = .empty,
             .limbs = .empty,
             .strings = .empty,
+            .string_bytes = .empty,
             .tracked_insts = .empty,
             .files = .empty,
             .maps = .empty,
 @@ -6808,6 +6833,7 @@ pub fn init(ip: *InternPool, gpa: Allocator, available_threads: usize) !void {
             .namespaces = .empty,
         },
     });
+    for (ip.locals) |*local| try local.getMutableStrings(gpa).append(.{0});
     ip.tid_width = @intCast(std.math.log2_int_ceil(usize, used_threads));
     ip.tid_shift_30 = if (single_threaded) 0 else 30 - ip.tid_width;
 @@ -8515,30 +8541,30 @@ pub fn get(ip: *InternPool, gpa: Allocator, tid: Zcu.PerThread.Id, key: Key) All
             }
             if (child == .u8_type) bytes: {
-                const strings = ip.getLocal(tid).getMutableStrings(gpa);
+                const string_bytes = ip.getLocal(tid).getMutableStringBytes(gpa);
-                const start = strings.mutate.len;
+                const start = string_bytes.mutate.len;
-                try strings.ensureUnusedCapacity(@intCast(len_including_sentinel + 1));
+                try string_bytes.ensureUnusedCapacity(@intCast(len_including_sentinel + 1));
                 try extra.ensureUnusedCapacity(@typeInfo(Bytes).@"struct".fields.len);
                 switch (aggregate.storage) {
-                    .bytes => |bytes| strings.appendSliceAssumeCapacity(.{bytes.toSlice(len, ip)}),
+                    .bytes => |bytes| string_bytes.appendSliceAssumeCapacity(.{bytes.toSlice(len, ip)}),
                     .elems => |elems| for (elems[0..@intCast(len)]) |elem| switch (ip.indexToKey(elem)) {
                         .undef => {
-                            strings.shrinkRetainingCapacity(start);
+                            string_bytes.shrinkRetainingCapacity(start);
                             break :bytes;
                         },
-                        .int => |int| strings.appendAssumeCapacity(.{@intCast(int.storage.u64)}),
+                        .int => |int| string_bytes.appendAssumeCapacity(.{@intCast(int.storage.u64)}),
                         else => unreachable,
                     },
                     .repeated_elem => |elem| switch (ip.indexToKey(elem)) {
                         .undef => break :bytes,
                         .int => |int| @memset(
-                            strings.addManyAsSliceAssumeCapacity(@intCast(len))[0],
+                            string_bytes.addManyAsSliceAssumeCapacity(@intCast(len))[0],
                             @intCast(int.storage.u64),
                         ),
                         else => unreachable,
                     },
                 }
-                if (sentinel != .none) strings.appendAssumeCapacity(.{
+                if (sentinel != .none) string_bytes.appendAssumeCapacity(.{
                     @intCast(ip.indexToKey(sentinel).int.storage.u64),
                 });
                 const string = try ip.getOrPutTrailingString(
 @@ -11754,10 +11780,10 @@ pub fn getOrPutString(
     slice: []const u8,
     comptime embedded_nulls: EmbeddedNulls,
 ) Allocator.Error!embedded_nulls.StringType() {
-    const strings = ip.getLocal(tid).getMutableStrings(gpa);
+    const string_bytes = ip.getLocal(tid).getMutableStringBytes(gpa);
-    try strings.ensureUnusedCapacity(slice.len + 1);
+    try string_bytes.ensureUnusedCapacity(slice.len + 1);
-    strings.appendSliceAssumeCapacity(.{slice});
+    string_bytes.appendSliceAssumeCapacity(.{slice});
-    strings.appendAssumeCapacity(.{0});
+    string_bytes.appendAssumeCapacity(.{0});
     return ip.getOrPutTrailingString(gpa, tid, @intCast(slice.len + 1), embedded_nulls);
 }
 @@ -11772,8 +11798,8 @@ pub fn getOrPutStringFmt(
     // ensure that references to strings in args do not get invalidated
     const format_z = format ++ .{0};
     const len: u32 = @intCast(std.fmt.count(format_z, args));
-    const strings = ip.getLocal(tid).getMutableStrings(gpa);
+    const string_bytes = ip.getLocal(tid).getMutableStringBytes(gpa);
-    const slice = try strings.addManyAsSlice(len);
+    const slice = try string_bytes.addManyAsSlice(len);
     assert((std.fmt.bufPrint(slice[0], format_z, args) catch unreachable).len == len);
     return ip.getOrPutTrailingString(gpa, tid, len, embedded_nulls);
 }
 @@ -11797,21 +11823,27 @@ pub fn getOrPutTrailingString(
     len: u32,
     comptime embedded_nulls: EmbeddedNulls,
 ) Allocator.Error!embedded_nulls.StringType() {
-    const strings = ip.getLocal(tid).getMutableStrings(gpa);
+    const local = ip.getLocal(tid);
-    const start: u32 = @intCast(strings.mutate.len - len);
+    const strings = local.getMutableStrings(gpa);
-    if (len > 0 and strings.view().items(.@"0")[strings.mutate.len - 1] == 0) {
+    try strings.ensureUnusedCapacity(1);
-        strings.mutate.len -= 1;
+    const string_bytes = local.getMutableStringBytes(gpa);
+    const start: u32 = @intCast(string_bytes.mutate.len - len);
+    if (len > 0 and string_bytes.view().items(.@"0")[string_bytes.mutate.len - 1] == 0) {
+        string_bytes.mutate.len -= 1;
     } else {
-        try strings.ensureUnusedCapacity(1);
+        try string_bytes.ensureUnusedCapacity(1);
     }
-    const key: []const u8 = strings.view().items(.@"0")[start..];
+    const key: []const u8 = string_bytes.view().items(.@"0")[start..];
-    const value: embedded_nulls.StringType() =
+    const value: embedded_nulls.StringType() = @enumFromInt(@intFromEnum((String.Unwrapped{
-        @enumFromInt(@intFromEnum((String.Unwrapped{ .tid = tid, .index = start }).wrap(ip)));
+        .tid = tid,
+        .index = strings.mutate.len - 1,
+    }).wrap(ip)));
     const has_embedded_null = std.mem.indexOfScalar(u8, key, 0) != null;
     switch (embedded_nulls) {
         .no_embedded_nulls => assert(!has_embedded_null),
         .maybe_embedded_nulls => if (has_embedded_null) {
-            strings.appendAssumeCapacity(.{0});
+            string_bytes.appendAssumeCapacity(.{0});
+            strings.appendAssumeCapacity(.{string_bytes.mutate.len});
             return value;
         },
     }
 @@ -11829,7 +11861,7 @@ pub fn getOrPutTrailingString(
         const index = entry.acquire().unwrap() orelse break;
         if (entry.hash != hash) continue;
         if (!index.eqlSlice(key, ip)) continue;
-        strings.shrinkRetainingCapacity(start);
+        string_bytes.shrinkRetainingCapacity(start);
         return @enumFromInt(@intFromEnum(index));
     }
     shard.mutate.string_map.mutex.lock();
 @@ -11845,19 +11877,20 @@ pub fn getOrPutTrailingString(
         const index = entry.acquire().unwrap() orelse break;
         if (entry.hash != hash) continue;
         if (!index.eqlSlice(key, ip)) continue;
-        strings.shrinkRetainingCapacity(start);
+        string_bytes.shrinkRetainingCapacity(start);
         return @enumFromInt(@intFromEnum(index));
     }
     defer shard.mutate.string_map.len += 1;
     const map_header = map.header().*;
     if (shard.mutate.string_map.len < map_header.capacity * 3 / 5) {
-        strings.appendAssumeCapacity(.{0});
+        string_bytes.appendAssumeCapacity(.{0});
+        strings.appendAssumeCapacity(.{string_bytes.mutate.len});
         const entry = &map.entries[map_index];
         entry.hash = hash;
         entry.release(@enumFromInt(@intFromEnum(value)));
         return value;
     }
-    const arena_state = &ip.getLocal(tid).mutate.arena;
+    const arena_state = &local.mutate.arena;
     var arena = arena_state.promote(gpa);
     defer arena_state.* = arena.state;
     const new_map_capacity = map_header.capacity * 2;
 @@ -11893,7 +11926,8 @@ pub fn getOrPutTrailingString(
         map_index &= new_map_mask;
         if (map.entries[map_index].value == .none) break;
     }
-    strings.appendAssumeCapacity(.{0});
+    string_bytes.appendAssumeCapacity(.{0});
+    strings.appendAssumeCapacity(.{string_bytes.mutate.len});
     map.entries[map_index] = .{
         .value = @enumFromInt(@intFromEnum(value)),
         .hash = hash,

src/Value.zig+7-7

...	@@ -66,8 +66,8 @@ pub fn toIpString(val: Value, ty: Type, pt: Zcu.PerThread) !InternPool.NullTermi	...	@@ -66,8 +66,8 @@ pub fn toIpString(val: Value, ty: Type, pt: Zcu.PerThread) !InternPool.NullTermi
66	.repeated_elem => \|elem\| {	66	.repeated_elem => \|elem\| {
67	const byte: u8 = @intCast(Value.fromInterned(elem).toUnsignedInt(zcu));	67	const byte: u8 = @intCast(Value.fromInterned(elem).toUnsignedInt(zcu));
68	const len: u32 = @intCast(ty.arrayLen(zcu));	68	const len: u32 = @intCast(ty.arrayLen(zcu));
69	const strings = ip.getLocal(pt.tid).getMutableStrings(zcu.gpa);	69	const string_bytes = ip.getLocal(pt.tid).getMutableStringBytes(zcu.gpa);
70	try strings.appendNTimes(.{byte}, len);	70	try string_bytes.appendNTimes(.{byte}, len);
71	return ip.getOrPutTrailingString(zcu.gpa, pt.tid, len, .no_embedded_nulls);	71	return ip.getOrPutTrailingString(zcu.gpa, pt.tid, len, .no_embedded_nulls);
72	},	72	},
73	}	73	}
...	@@ -109,16 +109,16 @@ fn arrayToIpString(val: Value, len_u64: u64, pt: Zcu.PerThread) !InternPool.Null	...	@@ -109,16 +109,16 @@ fn arrayToIpString(val: Value, len_u64: u64, pt: Zcu.PerThread) !InternPool.Null
109	const gpa = zcu.gpa;	109	const gpa = zcu.gpa;
110	const ip = &zcu.intern_pool;	110	const ip = &zcu.intern_pool;
111	const len: u32 = @intCast(len_u64);	111	const len: u32 = @intCast(len_u64);
112	const strings = ip.getLocal(pt.tid).getMutableStrings(gpa);	112	const string_bytes = ip.getLocal(pt.tid).getMutableStringBytes(gpa);
113	try strings.ensureUnusedCapacity(len);	113	try string_bytes.ensureUnusedCapacity(len);
114	for (0..len) \|i\| {	114	for (0..len) \|i\| {
115	// I don't think elemValue has the possibility to affect ip.string_bytes. Let's	115	// I don't think elemValue has the possibility to affect ip.string_bytes. Let's
116	// assert just to be sure.	116	// assert just to be sure.
117	const prev_len = strings.mutate.len;	117	const prev_len = string_bytes.mutate.len;
118	const elem_val = try val.elemValue(pt, i);	118	const elem_val = try val.elemValue(pt, i);
119	assert(strings.mutate.len == prev_len);	119	assert(string_bytes.mutate.len == prev_len);
120	const byte: u8 = @intCast(elem_val.toUnsignedInt(zcu));	120	const byte: u8 = @intCast(elem_val.toUnsignedInt(zcu));
121	strings.appendAssumeCapacity(.{byte});	121	string_bytes.appendAssumeCapacity(.{byte});
122	}	122	}
123	return ip.getOrPutTrailingString(gpa, pt.tid, len, .no_embedded_nulls);	123	return ip.getOrPutTrailingString(gpa, pt.tid, len, .no_embedded_nulls);
124	}	124	}

src/Zcu.zig+2-2

...	@@ -1116,8 +1116,8 @@ pub const File = struct {	...	@@ -1116,8 +1116,8 @@ pub const File = struct {
1116	pub fn internFullyQualifiedName(file: File, pt: Zcu.PerThread) !InternPool.NullTerminatedString {	1116	pub fn internFullyQualifiedName(file: File, pt: Zcu.PerThread) !InternPool.NullTerminatedString {
1117	const gpa = pt.zcu.gpa;	1117	const gpa = pt.zcu.gpa;
1118	const ip = &pt.zcu.intern_pool;	1118	const ip = &pt.zcu.intern_pool;
1119	const strings = ip.getLocal(pt.tid).getMutableStrings(gpa);	1119	const string_bytes = ip.getLocal(pt.tid).getMutableStringBytes(gpa);
1120	var w: Writer = .fixed((try strings.addManyAsSlice(file.fullyQualifiedNameLen()))[0]);	1120	var w: Writer = .fixed((try string_bytes.addManyAsSlice(file.fullyQualifiedNameLen()))[0]);
1121	file.renderFullyQualifiedName(&w) catch unreachable;	1121	file.renderFullyQualifiedName(&w) catch unreachable;
1122	assert(w.end == w.buffer.len);	1122	assert(w.end == w.buffer.len);
1123	return ip.getOrPutTrailingString(gpa, pt.tid, @intCast(w.end), .no_embedded_nulls);	1123	return ip.getOrPutTrailingString(gpa, pt.tid, @intCast(w.end), .no_embedded_nulls);

src/Zcu/PerThread.zig+4-4

...	@@ -2459,10 +2459,10 @@ fn updateEmbedFileInner(	...	@@ -2459,10 +2459,10 @@ fn updateEmbedFileInner(
2459		2459
2460	// The loaded bytes of the file, including a sentinel 0 byte.	2460	// The loaded bytes of the file, including a sentinel 0 byte.
2461	const ip_str: InternPool.String = str: {	2461	const ip_str: InternPool.String = str: {
2462	const strings = ip.getLocal(tid).getMutableStrings(gpa);	2462	const string_bytes = ip.getLocal(tid).getMutableStringBytes(gpa);
2463	const old_len = strings.mutate.len;	2463	const old_len = string_bytes.mutate.len;
2464	errdefer strings.shrinkRetainingCapacity(old_len);	2464	errdefer string_bytes.shrinkRetainingCapacity(old_len);
2465	const bytes = (try strings.addManyAsSlice(size_plus_one))[0];	2465	const bytes = (try string_bytes.addManyAsSlice(size_plus_one))[0];
2466	var fr = file.reader(&.{});	2466	var fr = file.reader(&.{});
2467	fr.size = stat.size;	2467	fr.size = stat.size;
2468	fr.interface.readSliceAll(bytes[0..size]) catch \|err\| switch (err) {	2468	fr.interface.readSliceAll(bytes[0..size]) catch \|err\| switch (err) {

...	@@ -3666,6 +3666,7 @@ const Header = extern struct {	...	@@ -3666,6 +3666,7 @@ const Header = extern struct {
3666	items_len: u32,	3666	items_len: u32,
3667	extra_len: u32,	3667	extra_len: u32,
3668	limbs_len: u32,	3668	limbs_len: u32,
		3669	strings_len: u32,
3669	string_bytes_len: u32,	3670	string_bytes_len: u32,
3670	tracked_insts_len: u32,	3671	tracked_insts_len: u32,
3671	files_len: u32,	3672	files_len: u32,
...	@@ -3714,7 +3715,8 @@ pub fn saveState(comp: *Compilation) !void {	...	@@ -3714,7 +3715,8 @@ pub fn saveState(comp: *Compilation) !void {
3714	.items_len = @intCast(local.mutate.items.len),	3715	.items_len = @intCast(local.mutate.items.len),
3715	.extra_len = @intCast(local.mutate.extra.len),	3716	.extra_len = @intCast(local.mutate.extra.len),
3716	.limbs_len = @intCast(local.mutate.limbs.len),	3717	.limbs_len = @intCast(local.mutate.limbs.len),
3717	.string_bytes_len = @intCast(local.mutate.strings.len),	3718	.strings_len = @intCast(local.mutate.strings.len),
		3719	.string_bytes_len = @intCast(local.mutate.string_bytes.len),
3718	.tracked_insts_len = @intCast(local.mutate.tracked_insts.len),	3720	.tracked_insts_len = @intCast(local.mutate.tracked_insts.len),
3719	.files_len = @intCast(local.mutate.files.len),	3721	.files_len = @intCast(local.mutate.files.len),
3720	},	3722	},
...	@@ -3757,8 +3759,11 @@ pub fn saveState(comp: *Compilation) !void {	...	@@ -3757,8 +3759,11 @@ pub fn saveState(comp: *Compilation) !void {
3757	addBuf(&bufs, @ptrCast(local.shared.items.view().items(.data)[0..pt_header.intern_pool.items_len]));	3759	addBuf(&bufs, @ptrCast(local.shared.items.view().items(.data)[0..pt_header.intern_pool.items_len]));
3758	addBuf(&bufs, @ptrCast(local.shared.items.view().items(.tag)[0..pt_header.intern_pool.items_len]));	3760	addBuf(&bufs, @ptrCast(local.shared.items.view().items(.tag)[0..pt_header.intern_pool.items_len]));
3759	}	3761	}
		3762	if (pt_header.intern_pool.strings_len > 0) {
		3763	addBuf(&bufs, @ptrCast(local.shared.strings.view().items(.@"0")[0..pt_header.intern_pool.strings_len]));
		3764	}
3760	if (pt_header.intern_pool.string_bytes_len > 0) {	3765	if (pt_header.intern_pool.string_bytes_len > 0) {
3761	addBuf(&bufs, local.shared.strings.view().items(.@"0")[0..pt_header.intern_pool.string_bytes_len]);	3766	addBuf(&bufs, local.shared.string_bytes.view().items(.@"0")[0..pt_header.intern_pool.string_bytes_len]);
3762	}	3767	}
3763	if (pt_header.intern_pool.tracked_insts_len > 0) {	3768	if (pt_header.intern_pool.tracked_insts_len > 0) {
3764	addBuf(&bufs, @ptrCast(local.shared.tracked_insts.view().items(.@"0")[0..pt_header.intern_pool.tracked_insts_len]));	3769	addBuf(&bufs, @ptrCast(local.shared.tracked_insts.view().items(.@"0")[0..pt_header.intern_pool.tracked_insts_len]));