Commit cff8ab88f5ffe24771aa9c6e839eef03bc22f3d2 | zig

author	Robin Voetter <robin@voetter.nl> 2023-09-22 19:22:44+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-09-23 12:36:56-07:00
log	cff8ab88f5ffe24771aa9c6e839eef03bc22f3d2
tree	1c6ef32977a615238c231c79c020c16a8b98da5d
parent	572517376a7695693c59a0ec4ec6cc5442003e3a

spirv: fixes

1 files changed, 12 insertions(+), 8 deletions(-)

src
- codegen
  - spirv.zig

src/codegen/spirv.zig+12-8

 @@ -771,21 +771,25 @@ pub const DeclGen = struct {
                     return try self.constructArray(result_ty_ref, constituents);
                 },
                 .struct_type => {
-                    const struct_ty = mod.typeToStruct(ty).?;
+                    const struct_type = mod.typeToStruct(ty).?;
-                    if (struct_ty.layout == .Packed) {
+                    if (struct_type.layout == .Packed) {
                         return self.todo("packed struct constants", .{});
                     }
                     var constituents = std.ArrayList(IdRef).init(self.gpa);
                     defer constituents.deinit();
-                    var field_it = struct_ty.runtimeFieldIterator(mod);
+                    var it = struct_type.iterateRuntimeOrder(ip);
-                    while (field_it.next()) |field_and_index| {
+                    while (it.next()) |field_index| {
-                        const field = field_and_index.field;
+                        const field_ty = struct_type.field_types.get(ip)[field_index].toType();
-                        const index = field_and_index.index;
+                        if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) {
+                            // This is a zero-bit field - we only needed it for the alignment.
+                            continue;
+                        }
                         // TODO: Padding?
-                        const field_val = try val.fieldValue(mod, index);
+                        const field_val = try val.fieldValue(mod, field_index);
-                        const field_id = try self.constant(field.ty, field_val, .indirect);
+                        const field_id = try self.constant(field_ty, field_val, .indirect);
                         try constituents.append(field_id);
                     }