ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 08:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5211 from Barinzaya/union-custom-align-tag-size

Browse Source 
Consider custom `#align` when determining union tag size
This commit is contained in:
Laytan
2025-06-20 22:31:31 +02:00
committed by GitHub
parent 7d8f41b938 717b9f1578
commit 2995557394
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/types.cpp
+4
View File
@@ -3093,6 +3093,9 @@ gb_internal i64 union_tag_size(Type *u) {
compiler_error("how many variants do you have?! %lld", cast(long long)u->Union.variants.count); compiler_error("how many variants do you have?! %lld", cast(long long)u->Union.variants.count);
} }
if (u->Union.custom_align > 0) {
max_align = gb_max(max_align, u->Union.custom_align);
} else {
for_array(i, u->Union.variants) { for_array(i, u->Union.variants) {
Type *variant_type = u->Union.variants[i]; Type *variant_type = u->Union.variants[i];
i64 align = type_align_of(variant_type); i64 align = type_align_of(variant_type);
@@ -3100,6 +3103,7 @@ gb_internal i64 union_tag_size(Type *u) {
max_align = align; max_align = align;
} }
} }
}
u->Union.tag_size = cast(i16)gb_min3(max_align, build_context.max_align, 8); u->Union.tag_size = cast(i16)gb_min3(max_align, build_context.max_align, 8);
return u->Union.tag_size; return u->Union.tag_size;