zig

commit 44e99edd7a12ea7e04fbfe53746c3af4b531f687 (tree)
parent a0289d0cce370729099a1ec0228e7f49bcdabc80
Author: mlugg <mlugg@noreply.codeberg.org>
Date:   Sat, 29 Nov 2025 20:21:30 +0100

Merge pull request 'Sema: initialize OPV comptime allocs correctly' (#30043) from reify-empty-struct into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/30043

Diffstat:
M
src/Sema.zig
 | 
4
+++-
M
src/print_zir.zig
 | 
2
+-
M
test/behavior/type.zig
 | 
9
+++++++++

3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/Sema.zig b/src/Sema.zig
@@ -175,9 +175,11 @@ const ComptimeAlloc = struct {
 
 /// `src` may be `null` if `is_const` will be set.
 fn newComptimeAlloc(sema: *Sema, block: *Block, src: LazySrcLoc, ty: Type, alignment: Alignment) !ComptimeAllocIndex {
+    const pt = sema.pt;
+    const init_val = try sema.typeHasOnePossibleValue(ty) orelse try pt.undefValue(ty);
     const idx = sema.comptime_allocs.items.len;
     try sema.comptime_allocs.append(sema.gpa, .{
-        .val = .{ .interned = try sema.pt.intern(.{ .undef = ty.toIntern() }) },
+        .val = .{ .interned = init_val.toIntern() },
         .is_const = false,
         .src = src,
         .alignment = alignment,
diff --git a/src/print_zir.zig b/src/print_zir.zig
@@ -595,7 +595,7 @@ const Writer = struct {
             },
 
             .reify_slice_arg_ty => {
-                const reify_slice_arg_info: Zir.Inst.ReifySliceArgInfo = @enumFromInt(extended.operand);
+                const reify_slice_arg_info: Zir.Inst.ReifySliceArgInfo = @enumFromInt(extended.small);
                 const extra = self.code.extraData(Zir.Inst.UnNode, extended.operand).data;
                 try stream.print("{t}, ", .{reify_slice_arg_info});
                 try self.writeInstRef(stream, extra.operand);
diff --git a/test/behavior/type.zig b/test/behavior/type.zig
@@ -427,3 +427,12 @@ test "undefined type value" {
     };
     comptime assert(@TypeOf(S.undef_type) == type);
 }
+
+test "reify struct with zero fields through const arrays" {
+    const names: [0][]const u8 = .{};
+    const types: [0]type = .{};
+    const attrs: [0]std.builtin.Type.StructField.Attributes = .{};
+    const S = @Struct(.auto, null, &names, &types, &attrs);
+    comptime assert(@typeInfo(S) == .@"struct");
+    comptime assert(@typeInfo(S).@"struct".fields.len == 0);
+}