mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

codegen: fix tuple padding

Browse Source 
Closes #25797
This commit is contained in:
Jacob Young 2025-11-03 22:33:10 -05:00 committed by Jacob Young
parent ea76946d2a
commit 459f3b7ede
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/codegen.zig
View File

@ -534,9 +534,7 @@ pub fn generateSymbol(
while (index < vector_type.len) : (index += 1) { while (index < vector_type.len) : (index += 1) {
try generateSymbol(bin_file, pt, src_loc, Value.fromInterned(switch (aggregate.storage) { try generateSymbol(bin_file, pt, src_loc, Value.fromInterned(switch (aggregate.storage) {
.bytes => unreachable, .bytes => unreachable,
.elems => |elems| elems[ .elems => |elems| elems[math.cast(usize, index) orelse return error.Overflow],
math.cast(usize, index) orelse return error.Overflow
],
.repeated_elem => |elem| elem, .repeated_elem => |elem| elem,
}), w, reloc_parent); }), w, reloc_parent);
} }
@ -551,35 +549,24 @@ pub fn generateSymbol(
}, },
.tuple_type => |tuple| { .tuple_type => |tuple| {
const struct_begin = w.end; const struct_begin = w.end;
for ( for (tuple.types.get(ip), tuple.values.get(ip), 0..) |field_ty, field_val, field_index| {
tuple.types.get(ip), if (field_val != .none) continue;
tuple.values.get(ip),
0..,
) |field_ty, comptime_val, index| {
if (comptime_val != .none) continue;
if (!Type.fromInterned(field_ty).hasRuntimeBits(zcu)) continue; if (!Type.fromInterned(field_ty).hasRuntimeBits(zcu)) continue;
const field_val = switch (aggregate.storage) { try w.splatByteAll(0, math.cast(usize, struct_begin +
Type.fromInterned(field_ty).abiAlignment(zcu).forward(w.end - struct_begin) - w.end) orelse
return error.Overflow);
try generateSymbol(bin_file, pt, src_loc, .fromInterned(switch (aggregate.storage) {
.bytes => |bytes| try pt.intern(.{ .int = .{ .bytes => |bytes| try pt.intern(.{ .int = .{
.ty = field_ty, .ty = field_ty,
.storage = .{ .u64 = bytes.at(index, ip) }, .storage = .{ .u64 = bytes.at(field_index, ip) },
} }), } }),
.elems => |elems| elems[index], .elems => |elems| elems[field_index],
.repeated_elem => |elem| elem, .repeated_elem => |elem| elem,
}; }), w, reloc_parent);
try generateSymbol(bin_file, pt, src_loc, Value.fromInterned(field_val), w, reloc_parent);
const unpadded_field_end = w.end - struct_begin;
// Pad struct members if required
const padded_field_end = ty.structFieldOffset(index + 1, zcu);
const padding = math.cast(usize, padded_field_end - unpadded_field_end) orelse
return error.Overflow;
if (padding > 0) {
try w.splatByteAll(0, padding);
}
} }
try w.splatByteAll(0, math.cast(usize, struct_begin + ty.abiSize(zcu) - w.end) orelse
return error.Overflow);
}, },
.struct_type => { .struct_type => {
const struct_type = ip.loadStructType(ty.toIntern()); const struct_type = ip.loadStructType(ty.toIntern());

12
test/behavior/tuple.zig
View File

@ -631,3 +631,15 @@ test "OPV tuple fields aren't comptime" {
const t2_info = @typeInfo(T2); const t2_info = @typeInfo(T2);
try expect(!t2_info.@"struct".fields[0].is_comptime); try expect(!t2_info.@"struct".fields[0].is_comptime);
} }
test "array of tuples that end with a zero-bit field followed by padding" {
const S = struct {
var foo: [2]struct { u32, u8, void } = .{ .{ 1, 2, {} }, .{ 3, 4, {} } };
};
try expect(S.foo[0][0] == 1);
try expect(S.foo[0][1] == 2);
try expect(S.foo[0][2] == {});
try expect(S.foo[1][0] == 3);
try expect(S.foo[1][1] == 4);
try expect(S.foo[1][2] == {});
}