zig

commit 3fc6a2f11399e84b9cfa4cfef65ef40aa6de173b (tree)
parent 63e5476450bfcec4aa8417e9ea5a3006b2a688a0
Author: kcbanner <kcbanner@gmail.com>
Date:   Fri, 10 Nov 2023 23:47:04 -0500

sema: pass sema through if available for the array_type case in bitSizeAdvanced

Diffstat:
M
src/type.zig
 | 
5
++++-
M
test/behavior/sizeof_and_typeof.zig
 | 
8
++++++++

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/type.zig b/src/type.zig
@@ -1519,7 +1519,10 @@ pub const Type = struct {
                 const len = array_type.len + @intFromBool(array_type.sentinel != .none);
                 if (len == 0) return 0;
                 const elem_ty = array_type.child.toType();
-                const elem_size = @max(elem_ty.abiAlignment(mod).toByteUnits(0), elem_ty.abiSize(mod));
+                const elem_size = @max(
+                    (try elem_ty.abiAlignmentAdvanced(mod, strat)).scalar.toByteUnits(0),
+                    (try elem_ty.abiSizeAdvanced(mod, strat)).scalar,
+                );
                 if (elem_size == 0) return 0;
                 const elem_bit_size = try bitSizeAdvanced(elem_ty, mod, opt_sema);
                 return (len - 1) * 8 * elem_size + elem_bit_size;
diff --git a/test/behavior/sizeof_and_typeof.zig b/test/behavior/sizeof_and_typeof.zig
@@ -300,3 +300,11 @@ test "@offsetOf zero-bit field" {
     };
     try expect(@offsetOf(S, "b") == @offsetOf(S, "c"));
 }
+
+test "@bitSizeOf on array of structs" {
+    const S = struct {
+        foo: u64,
+    };
+
+    try expectEqual(128, @bitSizeOf([2]S));
+}