mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: fix auto hash of tagged union with void field

Browse Source
This commit is contained in:
Isaac Freund 2021-06-14 04:45:44 +00:00 committed by Veikka Tuominen
parent 86ebd4b975
commit 2d4c439652
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/hash/auto_hash.zig
View File

@ -146,10 +146,12 @@ pub fn hash(hasher: anytype, key: anytype, comptime strat: HashStrategy) void {
.Union => |info| { .Union => |info| {
if (info.tag_type) |tag_type| { if (info.tag_type) |tag_type| {
const tag = meta.activeTag(key); const tag = meta.activeTag(key);
const s = hash(hasher, tag, strat); hash(hasher, tag, strat);
inline for (info.fields) |field| { inline for (info.fields) |field| {
if (@field(tag_type, field.name) == tag) { if (@field(tag_type, field.name) == tag) {
hash(hasher, @field(key, field.name), strat); if (field.field_type != void) {
hash(hasher, @field(key, field.name), strat);
}
// TODO use a labelled break when it does not crash the compiler. cf #2908 // TODO use a labelled break when it does not crash the compiler. cf #2908
// break :blk; // break :blk;
return; return;
@ -385,17 +387,23 @@ test "testHash union" {
A: u32, A: u32,
B: bool, B: bool,
C: u32, C: u32,
D: void,
}; };
const a = Foo{ .A = 18 }; const a = Foo{ .A = 18 };
var b = Foo{ .B = true }; var b = Foo{ .B = true };
const c = Foo{ .C = 18 }; const c = Foo{ .C = 18 };
const d: Foo = .D;
try testing.expect(testHash(a) == testHash(a)); try testing.expect(testHash(a) == testHash(a));
try testing.expect(testHash(a) != testHash(b)); try testing.expect(testHash(a) != testHash(b));
try testing.expect(testHash(a) != testHash(c)); try testing.expect(testHash(a) != testHash(c));
try testing.expect(testHash(a) != testHash(d));
b = Foo{ .A = 18 }; b = Foo{ .A = 18 };
try testing.expect(testHash(a) == testHash(b)); try testing.expect(testHash(a) == testHash(b));
b = .D;
try testing.expect(testHash(d) == testHash(b));
} }
test "testHash vector" { test "testHash vector" {