mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-05 13:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: restore master branch field reordering behavior

Browse Source 
Let's try to reduce the explosive scope of this branch.
This commit is contained in:
Andrew Kelley 2023-09-20 13:09:13 -07:00
parent f739ac9c21
commit 2da62a7106
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Sema.zig
View File

@ -34349,9 +34349,28 @@ fn resolveStructLayout(sema: *Sema, ty: Type) CompileError!void {
return a_align.compare(.gt, b_align);
}
};
mem.sortUnstable(RuntimeOrder, runtime_order, AlignSortContext{
.aligns = aligns,
}, AlignSortContext.lessThan);
if (struct_type.isTuple(ip) or !mod.backendSupportsFeature(.field_reordering)) {
// TODO: don't handle tuples differently. This logic exists only because it
// uncovers latent bugs if removed. Fix the latent bugs and remove this logic!
// Likewise, implement field reordering support in all the backends!
// This logic does not reorder fields; it only moves the omitted ones to the end
// so that logic elsewhere does not need to special-case tuples.
var i: usize = 0;
var off: usize = 0;
while (i + off < runtime_order.len) {
if (runtime_order[i + off] == .omitted) {
off += 1;
continue;
}
runtime_order[i] = runtime_order[i + off];
i += 1;
}
@memset(runtime_order[i..], .omitted);
} else {
mem.sortUnstable(RuntimeOrder, runtime_order, AlignSortContext{
.aligns = aligns,
}, AlignSortContext.lessThan);
}
}
// Calculate size, alignment, and field offsets.