| author |  Ryan Mehri <rmehri01@tutamail.com> 2026-06-17 21:46:38-04:00 |
| committer |  Justus Klausecker <justusk@noreply.codeberg.org> 2026-06-18 11:41:36+02:00 |
| log | 14bc6f5917ae94902cdf209e3ac9af908b506795 |
| tree | 45c077c272990a11992103bbdb086851f03b6642 |
| parent | 46a750a006d90120feddcf0f0b9a0b5db9e222be |
Sema: check for undefined values in zirArrayCat
Right now, when an undefined tuple value is passed to zirArrayCat, it
will call `elemValue`, which will incorrectly try to produce a undef
value of the child type (of which there is none) and then panics.
This adds a check for an undef value first to produce an undef elem
value of the correct resolved type.2 files changed, 22 insertions(+), 2 deletions(-)
src/Sema.zig+4-2
| ... | ... | @@ -13479,7 +13479,8 @@ fn zirArrayCat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai |
| 13479 | 13479 | while (elem_i < lhs_len) : (elem_i += 1) { |
| 13480 | 13480 | const lhs_elem_i = elem_i; |
| 13481 | 13481 | const elem_default_val: ?Value = if (lhs_is_tuple) lhs_ty.structFieldDefaultValue(lhs_elem_i, zcu) else null; |
| 13482 | const elem_val = elem_default_val orelse try lhs_sub_val.elemValue(pt, lhs_elem_i); | |
| 13482 | const elem_val = elem_default_val orelse | |
| 13483 | if (lhs_sub_val.isUndef(zcu)) try pt.undefValue(resolved_elem_ty) else try lhs_sub_val.elemValue(pt, lhs_elem_i); | |
| 13483 | 13484 | const operand_src = block.src(.{ .array_cat_lhs = .{ |
| 13484 | 13485 | .array_cat_offset = inst_data.src_node, |
| 13485 | 13486 | .elem_index = elem_i, |
| ... | ... | @@ -13491,7 +13492,8 @@ fn zirArrayCat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai |
| 13491 | 13492 | while (elem_i < result_len) : (elem_i += 1) { |
| 13492 | 13493 | const rhs_elem_i = elem_i - lhs_len; |
| 13493 | 13494 | const elem_default_val: ?Value = if (rhs_is_tuple) rhs_ty.structFieldDefaultValue(rhs_elem_i, zcu) else null; |
| 13494 | const elem_val = elem_default_val orelse try rhs_sub_val.elemValue(pt, rhs_elem_i); | |
| 13495 | const elem_val = elem_default_val orelse | |
| 13496 | if (rhs_sub_val.isUndef(zcu)) try pt.undefValue(resolved_elem_ty) else try rhs_sub_val.elemValue(pt, rhs_elem_i); | |
| 13495 | 13497 | const operand_src = block.src(.{ .array_cat_rhs = .{ |
| 13496 | 13498 | .array_cat_offset = inst_data.src_node, |
| 13497 | 13499 | .elem_index = @intCast(rhs_elem_i), |
test/behavior/array.zig+18
| ... | ... | @@ -98,6 +98,24 @@ test "array concat with tuple" { |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | test "array concat with undefined tuple" { | |
| 102 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; | |
| 103 | ||
| 104 | { | |
| 105 | const array: [2]u64 = .{ 1, 2 }; | |
| 106 | var seq = array ++ @as(struct { u32, u16 }, undefined); | |
| 107 | seq[2] = 3; | |
| 108 | seq[3] = 4; | |
| 109 | try std.testing.expectEqualSlices(u64, &.{ 1, 2, 3, 4 }, &seq); | |
| 110 | } | |
| 111 | { | |
| 112 | const array: [2]u64 = undefined; | |
| 113 | var seq = @as(struct { u32, u16 }, undefined) ++ array; | |
| 114 | for (&seq, 1..) |*s, i| s.* = i; | |
| 115 | try std.testing.expectEqualSlices(u64, &.{ 1, 2, 3, 4 }, &seq); | |
| 116 | } | |
| 117 | } | |
| 118 | ||
| 101 | 119 | test "array init with concat" { |
| 102 | 120 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; |
| 103 | 121 |