authorgravatar for 94326797+riverbl@users.noreply.github.comriverbl <94326797+riverbl@users.noreply.github.com> 2022-01-24 15:31:27+00:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-01-24 17:31:27+02:00
log1f10cf4edf2b645e63dedc42f5d7475914bf2311
treefdc16957a46c7f8c81035e95e189e16845bea5bb
parentc54a7ca4b25a0ffe080a80fb19986142c98b124e
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

MultiArrayList: Fix error when struct is 0 sized

Also fixes error with ArrayHashMap when both key and value are 0 sized

2 files changed, 86 insertions(+), 6 deletions(-)

lib/std/array_hash_map.zig+29
......@@ -2215,6 +2215,35 @@ test "auto store_hash" {
22152215 try testing.expect(meta.fieldInfo(HasExpensiveEqlUn.Data, .hash).field_type != void);
22162216}
22172217
2218test "0 sized key" {
2219 var map = AutoArrayHashMap(u0, i32).init(std.testing.allocator);
2220 defer map.deinit();
2221
2222 try testing.expectEqual(map.get(0), null);
2223
2224 try map.put(0, 5);
2225 try testing.expectEqual(map.get(0), 5);
2226
2227 try map.put(0, 10);
2228 try testing.expectEqual(map.get(0), 10);
2229
2230 try testing.expectEqual(map.swapRemove(0), true);
2231 try testing.expectEqual(map.get(0), null);
2232}
2233
2234test "0 sized key and 0 sized value" {
2235 var map = AutoArrayHashMap(u0, u0).init(std.testing.allocator);
2236 defer map.deinit();
2237
2238 try testing.expectEqual(map.get(0), null);
2239
2240 try map.put(0, 0);
2241 try testing.expectEqual(map.get(0), 0);
2242
2243 try testing.expectEqual(map.swapRemove(0), true);
2244 try testing.expectEqual(map.get(0), null);
2245}
2246
22182247pub fn getHashPtrAddrFn(comptime K: type, comptime Context: type) (fn (Context, K) u32) {
22192248 return struct {
22202249 fn hash(ctx: Context, key: K) u32 {
lib/std/multi_array_list.zig+57-6
......@@ -16,7 +16,9 @@ const testing = std.testing;
1616/// `.items(.<field_name>)` to obtain a slice of field values.
1717pub fn MultiArrayList(comptime S: type) type {
1818 return struct {
19 bytes: [*]align(@alignOf(S)) u8 = undefined,
19 const alignS = if (@alignOf(S) == 0) 1 else @alignOf(S);
20
21 bytes: [*]align(alignS) u8 = undefined,
2022 len: usize = 0,
2123 capacity: usize = 0,
2224
......@@ -50,8 +52,8 @@ pub fn MultiArrayList(comptime S: type) type {
5052 return .{};
5153 }
5254 const unaligned_ptr = self.ptrs[sizes.fields[0]];
53 const aligned_ptr = @alignCast(@alignOf(S), unaligned_ptr);
54 const casted_ptr = @ptrCast([*]align(@alignOf(S)) u8, aligned_ptr);
55 const aligned_ptr = @alignCast(alignS, unaligned_ptr);
56 const casted_ptr = @ptrCast([*]align(alignS) u8, aligned_ptr);
5557 return .{
5658 .bytes = casted_ptr,
5759 .len = self.len,
......@@ -261,7 +263,7 @@ pub fn MultiArrayList(comptime S: type) type {
261263
262264 const other_bytes = gpa.allocAdvanced(
263265 u8,
264 @alignOf(S),
266 alignS,
265267 capacityInBytes(new_len),
266268 .exact,
267269 ) catch {
......@@ -339,7 +341,7 @@ pub fn MultiArrayList(comptime S: type) type {
339341 assert(new_capacity >= self.len);
340342 const new_bytes = try gpa.allocAdvanced(
341343 u8,
342 @alignOf(S),
344 alignS,
343345 capacityInBytes(new_capacity),
344346 .exact,
345347 );
......@@ -398,7 +400,7 @@ pub fn MultiArrayList(comptime S: type) type {
398400 return @reduce(.Add, capacity_vector * sizes_vector);
399401 }
400402
401 fn allocatedBytes(self: Self) []align(@alignOf(S)) u8 {
403 fn allocatedBytes(self: Self) []align(alignS) u8 {
402404 return self.bytes[0..capacityInBytes(self.capacity)];
403405 }
404406
......@@ -621,3 +623,52 @@ test "insert elements" {
621623 try testing.expectEqualSlices(u8, &[_]u8{ 1, 2 }, list.items(.a));
622624 try testing.expectEqualSlices(u32, &[_]u32{ 2, 3 }, list.items(.b));
623625}
626
627test "0 sized struct field" {
628 const ally = testing.allocator;
629
630 const Foo = struct {
631 a: u0,
632 b: f32,
633 };
634
635 var list = MultiArrayList(Foo){};
636 defer list.deinit(ally);
637
638 try testing.expectEqualSlices(u0, &[_]u0{}, list.items(.a));
639 try testing.expectEqualSlices(f32, &[_]f32{}, list.items(.b));
640
641 try list.append(ally, .{ .a = 0, .b = 42.0 });
642 try testing.expectEqualSlices(u0, &[_]u0{0}, list.items(.a));
643 try testing.expectEqualSlices(f32, &[_]f32{42.0}, list.items(.b));
644
645 try list.insert(ally, 0, .{ .a = 0, .b = -1.0 });
646 try testing.expectEqualSlices(u0, &[_]u0{ 0, 0 }, list.items(.a));
647 try testing.expectEqualSlices(f32, &[_]f32{ -1.0, 42.0 }, list.items(.b));
648
649 list.swapRemove(list.len - 1);
650 try testing.expectEqualSlices(u0, &[_]u0{0}, list.items(.a));
651 try testing.expectEqualSlices(f32, &[_]f32{-1.0}, list.items(.b));
652}
653
654test "0 sized struct" {
655 const ally = testing.allocator;
656
657 const Foo = struct {
658 a: u0,
659 };
660
661 var list = MultiArrayList(Foo){};
662 defer list.deinit(ally);
663
664 try testing.expectEqualSlices(u0, &[_]u0{}, list.items(.a));
665
666 try list.append(ally, .{ .a = 0 });
667 try testing.expectEqualSlices(u0, &[_]u0{0}, list.items(.a));
668
669 try list.insert(ally, 0, .{ .a = 0 });
670 try testing.expectEqualSlices(u0, &[_]u0{ 0, 0 }, list.items(.a));
671
672 list.swapRemove(list.len - 1);
673 try testing.expectEqualSlices(u0, &[_]u0{0}, list.items(.a));
674}