diff options
| author | Veikka Tuominen <git@vexu.eu> | 2022-10-18 12:40:01 +0300 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2022-10-20 20:11:00 +0300 |
| commit | 13897be0abfeddf7bdfbdc1600bd8279c26004de (patch) | |
| tree | 59417b4c3b27894002a20faa1dd64882a87572fc /src/type.zig | |
| parent | 4aaff75c8191b9cff40d3423f44bdb831a88d89b (diff) | |
| download | zig-13897be0abfeddf7bdfbdc1600bd8279c26004de.tar.gz zig-13897be0abfeddf7bdfbdc1600bd8279c26004de.zip | |
Type: bitSizeOf non-packed structs should include padding
Closes #13214
Diffstat (limited to 'src/type.zig')
| -rw-r--r-- | src/type.zig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/type.zig b/src/type.zig index 5685d097b9..9f954fb725 100644 --- a/src/type.zig +++ b/src/type.zig @@ -3619,6 +3619,9 @@ pub const Type = extern union { .@"struct" => { if (sema_kit) |sk| _ = try sk.sema.resolveTypeFields(sk.block, sk.src, ty); + if (ty.containerLayout() != .Packed) { + return (try ty.abiSizeAdvanced(target, if (sema_kit) |sk| .{ .sema_kit = sk } else .eager)).scalar * 8; + } var total: u64 = 0; for (ty.structFields().values()) |field| { total += try bitSizeAdvanced(field.ty, target, sema_kit); @@ -3628,6 +3631,9 @@ pub const Type = extern union { .tuple, .anon_struct => { if (sema_kit) |sk| _ = try sk.sema.resolveTypeFields(sk.block, sk.src, ty); + if (ty.containerLayout() != .Packed) { + return (try ty.abiSizeAdvanced(target, if (sema_kit) |sk| .{ .sema_kit = sk } else .eager)).scalar * 8; + } var total: u64 = 0; for (ty.tupleFields().types) |field_ty| { total += try bitSizeAdvanced(field_ty, target, sema_kit); @@ -3643,6 +3649,9 @@ pub const Type = extern union { .@"union", .union_safety_tagged, .union_tagged => { if (sema_kit) |sk| _ = try sk.sema.resolveTypeFields(sk.block, sk.src, ty); + if (ty.containerLayout() != .Packed) { + return (try ty.abiSizeAdvanced(target, if (sema_kit) |sk| .{ .sema_kit = sk } else .eager)).scalar * 8; + } const union_obj = ty.cast(Payload.Union).?.data; assert(union_obj.haveFieldTypes()); |