mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-08-14 01:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7314 from kalsprite/max_field_align

Browse Source 
struct layout: apply #max_field_align
This commit is contained in:
gingerBill
2026-08-12 11:30:35 +02:00
committed by GitHub
parent e92d24e88a 586f87c0e1
commit d4d0436a09
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/types.cpp
View File

@@ -4496,8 +4496,7 @@ gb_internal i64 type_align_of_internal(Type *t, TypePath *path) {
if (t->Struct.custom_min_field_align > 0) {
max = gb_max(max, t->Struct.custom_min_field_align);
}
if (t->Struct.custom_max_field_align != 0 &&
t->Struct.custom_max_field_align > t->Struct.custom_min_field_align) {
if (t->Struct.custom_max_field_align != 0) {
max = gb_min(max, t->Struct.custom_max_field_align);
}
return max;
@@ -4567,7 +4566,7 @@ gb_internal i64 *type_set_offsets_of(Slice<Entity *> const &fields, bool is_pack
} else {
Type *t = fields[i]->type;
i64 align = gb_max(type_align_of_internal(t, &path), min_field_align);
if (max_field_align > min_field_align) {
if (max_field_align != 0) {
align = gb_min(align, max_field_align);
}
i64 size = gb_max(type_size_of_internal(t, &path), 0);