From 1f823eecdd071f619c761a743119f1a2a89af1bf Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 20 Jan 2022 16:21:49 -0700 Subject: [PATCH] stage2: fix compilation on 32 bit targets --- src/Liveness.zig | 2 +- src/Sema.zig | 2 +- src/print_air.zig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Liveness.zig b/src/Liveness.zig index 1bc3159964..c7d0e481c5 100644 --- a/src/Liveness.zig +++ b/src/Liveness.zig @@ -373,7 +373,7 @@ fn analyzeInst( .vector_init => { const ty_pl = inst_datas[inst].ty_pl; const vector_ty = a.air.getRefType(ty_pl.ty); - const len = vector_ty.arrayLen(); + const len = @intCast(usize, vector_ty.arrayLen()); const elements = @bitCast([]const Air.Inst.Ref, a.air.extra[ty_pl.payload..][0..len]); if (elements.len <= bpi - 1) { diff --git a/src/Sema.zig b/src/Sema.zig index 8093e04a34..d3802a1784 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -15056,7 +15056,7 @@ fn coerceTupleToArray( ) !Air.Inst.Ref { const inst_ty = sema.typeOf(inst); const inst_len = inst_ty.arrayLen(); - const dest_len = dest_ty.arrayLen(); + const dest_len = try sema.usizeCast(block, dest_ty_src, dest_ty.arrayLen()); if (dest_len != inst_len) { const msg = msg: { diff --git a/src/print_air.zig b/src/print_air.zig index 9a116f6d8e..d9bb14ca7b 100644 --- a/src/print_air.zig +++ b/src/print_air.zig @@ -296,7 +296,7 @@ const Writer = struct { fn writeVectorInit(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void { const ty_pl = w.air.instructions.items(.data)[inst].ty_pl; const vector_ty = w.air.getRefType(ty_pl.ty); - const len = vector_ty.arrayLen(); + const len = @intCast(usize, vector_ty.arrayLen()); const elements = @bitCast([]const Air.Inst.Ref, w.air.extra[ty_pl.payload..][0..len]); try s.print("{}, [", .{vector_ty});