zig

commit 55bc8a7fa9b820766df2e7625afdd7e88863cc96 (tree)
parent 2e5d13e9cf55ee66c544950b59f8620e626801a7
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 21 Sep 2023 15:27:25 -0700

compiler: fix compilation for 32-bit targets

Diffstat:
M
src/Module.zig
 | 
2
+-
M
src/arch/x86_64/CodeGen.zig
 | 
3
++-
M
src/codegen.zig
 | 
2
+-

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/Module.zig b/src/Module.zig
@@ -6657,7 +6657,7 @@ pub fn structFieldAlignmentExtern(mod: *Module, field_ty: Type) Alignment {
 pub fn structPackedFieldBitOffset(
     mod: *Module,
     struct_type: InternPool.Key.StructType,
-    field_index: usize,
+    field_index: u32,
 ) u16 {
     const ip = &mod.intern_pool;
     assert(struct_type.layout == .Packed);
diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig
@@ -11426,7 +11426,8 @@ fn airAggregateInit(self: *Self, inst: Air.Inst.Index) !void {
                         .{ .immediate = 0 },
                         .{ .immediate = result_ty.abiSize(mod) },
                     );
-                    for (elements, 0..) |elem, elem_i| {
+                    for (elements, 0..) |elem, elem_i_usize| {
+                        const elem_i: u32 = @intCast(elem_i_usize);
                         if ((try result_ty.structFieldValueComptime(mod, elem_i)) != null) continue;
 
                         const elem_ty = result_ty.structFieldType(elem_i, mod);
diff --git a/src/codegen.zig b/src/codegen.zig
@@ -705,7 +705,7 @@ fn lowerParentPtr(
                         .Packed => if (mod.typeToStruct(base_type.toType())) |struct_type|
                             math.divExact(u16, mod.structPackedFieldBitOffset(
                                 struct_type,
-                                field.index,
+                                @intCast(field.index),
                             ), 8) catch |err| switch (err) {
                                 error.UnexpectedRemainder => 0,
                                 error.DivisionByZero => unreachable,