From 7fbbeae617ad9c30605a78377888c284e5d9ccdc Mon Sep 17 00:00:00 2001 From: Bogdan Romanyuk <65823030+wrongnull@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:35:29 +0300 Subject: [PATCH] value: handle lazy_align and lazy_size in writeToPackedMemory --- src/value.zig | 9 ++++++++- test/behavior/enum.zig | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/value.zig b/src/value.zig index f046b9ae3d754f91b913b3c679ceac16a259f8d7..45f603ed2daa9b71c2511173c8bc755e9d248ba8 100644 --- a/src/value.zig +++ b/src/value.zig @@ -803,7 +803,14 @@ pub const Value = struct { switch (ip.indexToKey((try val.intFromEnum(ty, mod)).toIntern()).int.storage) { inline .u64, .i64 => |int| std.mem.writeVarPackedInt(buffer, bit_offset, bits, int, endian), .big_int => |bigint| bigint.writePackedTwosComplement(buffer, bit_offset, bits, endian), - else => unreachable, + .lazy_align => |lazy_align| { + const num = Type.fromInterned(lazy_align).abiAlignment(mod).toByteUnits(0); + std.mem.writeVarPackedInt(buffer, bit_offset, bits, num, endian); + }, + .lazy_size => |lazy_size| { + const num = Type.fromInterned(lazy_size).abiSize(mod); + std.mem.writeVarPackedInt(buffer, bit_offset, bits, num, endian); + }, } }, .Float => switch (ty.floatBits(target)) { diff --git a/test/behavior/enum.zig b/test/behavior/enum.zig index d203476afcc4fb9137cd1fd67e1fb94d4f7508af..6c111c3751d2e3cf88240fc627b8c787149c564f 100644 --- a/test/behavior/enum.zig +++ b/test/behavior/enum.zig @@ -1225,3 +1225,13 @@ test "auto-numbered enum with signed tag type" { try std.testing.expectEqualStrings("a", @tagName(E.a)); try std.testing.expectEqualStrings("b", @tagName(E.b)); } + +test "lazy initialized field" { + try std.testing.expectEqual(@as(u8, @alignOf(struct {})), getLazyInitialized(.a)); +} + +fn getLazyInitialized(param: enum(u8) { + a = @bitCast(packed struct(u8) { a: u8 }{ .a = @alignOf(struct {}) }), +}) u8 { + return @intFromEnum(param); +} -- 2.54.0