mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 21:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

InternPool: avoid aggregate null bytes storage

Browse Source 
This is a workaround for InternPool currently not handling
non-null-terminated strings. It avoids using the `bytes` storage for
aggregates if there are any null bytes.

In the future this should be changed so that the `bytes` storage can be
used regardless of whether there are any null bytes. This is important
for use cases such as `@embedFile`.

However, this fixes a bug for now, and after this commit, stage2
self-hosts again.

mlugg: stage5 passes all enabled behavior tests on my system.

Commit message edited by Andrew Kelley <andrew@ziglang.org>
This commit is contained in:
mlugg 2023-06-02 13:47:38 +01:00 committed by Andrew Kelley
parent 0f80652efb
commit 0fd52cdc5e
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/InternPool.zig
View File

@ -3951,6 +3951,15 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {
else => unreachable,
},
}
// We can't dedup '0' bytes in the pool or it could add garbage to string_bytes. So
// if there are any 0 bytes, we have to skip the bytes case. Note that it's okay for
// our sentinel to be 0 since getOrPutTrailingString would add a 0 sentinel anyway.
for (ip.string_bytes.items[string_bytes_index..]) |x| {
if (x == 0) {
ip.string_bytes.shrinkRetainingCapacity(string_bytes_index);
break :bytes;
}
}
if (sentinel != .none) ip.string_bytes.appendAssumeCapacity(
@intCast(u8, ip.indexToKey(sentinel).int.storage.u64),
);
@ -3975,7 +3984,17 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {
.ty = aggregate.ty,
}),
});
ip.extra.appendSliceAssumeCapacity(@ptrCast([]const u32, aggregate.storage.elems));
switch (aggregate.storage) {
.bytes => |bytes| for (bytes) |b| {
const elem = try ip.get(gpa, .{ .int = .{
.ty = .u8_type,
.storage = .{ .u64 = b },
} });
ip.extra.appendAssumeCapacity(@enumToInt(elem));
},
.elems => |elems| ip.extra.appendSliceAssumeCapacity(@ptrCast([]const u32, elems)),
.repeated_elem => |elem| ip.extra.appendNTimesAssumeCapacity(@enumToInt(elem), len),
}
if (sentinel != .none) ip.extra.appendAssumeCapacity(@enumToInt(sentinel));
},
@ -5203,7 +5222,7 @@ pub fn destroyFunc(ip: *InternPool, gpa: Allocator, index: Module.Fn.Index) void
ip.funcPtr(index).* = undefined;
ip.funcs_free_list.append(gpa, index) catch {
// In order to keep `destroyFunc` a non-fallible function, we ignore memory
// allocation failures here, instead leaking the Union until garbage collection.
// allocation failures here, instead leaking the Fn until garbage collection.
};
}

1
src/Module.zig
View File

@ -337,6 +337,7 @@ pub const CaptureScope = struct {
if (!self.failed()) {
self.captures.deinit(gpa);
}
gpa.destroy(self);
}
};