diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2023-05-31 20:24:12 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2023-06-10 20:47:58 -0700 |
| commit | 08ae212772c38d6149464274edc07282e5418570 (patch) | |
| tree | 8684d87abdcc9b7f722830e0d3d93faa877aeffb /src/InternPool.zig | |
| parent | c82a04d35f529c7dc8301059a0fe0b204f111145 (diff) | |
| download | zig-08ae212772c38d6149464274edc07282e5418570.tar.gz zig-08ae212772c38d6149464274edc07282e5418570.zip | |
InternPool: fix key for empty array with sentinel
Diffstat (limited to 'src/InternPool.zig')
| -rw-r--r-- | src/InternPool.zig | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/InternPool.zig b/src/InternPool.zig index edd3e7f1c2..d593ad1e17 100644 --- a/src/InternPool.zig +++ b/src/InternPool.zig @@ -2899,7 +2899,17 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key { const ty = @intToEnum(Index, data); const ty_item = ip.items.get(@enumToInt(ty)); return switch (ty_item.tag) { - .type_array_big, .type_array_small, .type_vector => .{ .aggregate = .{ + .type_array_big => { + const sentinel = @ptrCast( + *const [1]Index, + &ip.extra.items[ty_item.data + std.meta.fieldIndex(Array, "sentinel").?], + ); + return .{ .aggregate = .{ + .ty = ty, + .storage = .{ .elems = sentinel[0..@boolToInt(sentinel[0] != .none)] }, + } }; + }, + .type_array_small, .type_vector => .{ .aggregate = .{ .ty = ty, .storage = .{ .elems = &.{} }, } }, @@ -4799,11 +4809,9 @@ pub fn isAggregateType(ip: *const InternPool, ty: Index) bool { /// The is only legal because the initializer is not part of the hash. pub fn mutateVarInit(ip: *InternPool, index: Index, init_index: Index) void { - assert(ip.items.items(.tag)[@enumToInt(index)] == .variable); - const field_index = inline for (@typeInfo(Tag.Variable).Struct.fields, 0..) |field, field_index| { - if (comptime std.mem.eql(u8, field.name, "init")) break field_index; - } else unreachable; - ip.extra.items[ip.items.items(.data)[@enumToInt(index)] + field_index] = @enumToInt(init_index); + const item = ip.items.get(@enumToInt(index)); + assert(item.tag == .variable); + ip.extra.items[item.data + std.meta.fieldIndex(Tag.Variable, "init").?] = @enumToInt(init_index); } pub fn dump(ip: *const InternPool) void { |