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

Correct union size

Browse Source
This commit is contained in:
Ginger Bill
2017-10-08 15:19:01 +01:00
parent 6424966b7a
commit 8e4233b86a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/types.cpp
+4 -4
View File
@@ -1877,7 +1877,6 @@ i64 type_align_of_internal(gbAllocator allocator, Type *t, TypePath *path) {
return gb_clamp(t->Union.custom_align, 1, build_context.max_align); return gb_clamp(t->Union.custom_align, 1, build_context.max_align);
} }
i64 max = union_tag_size(t); i64 max = union_tag_size(t);
for_array(i, t->Union.variants) { for_array(i, t->Union.variants) {
Type *variant = t->Union.variants[i]; Type *variant = t->Union.variants[i];
@@ -2126,12 +2125,13 @@ i64 type_size_of_internal(gbAllocator allocator, Type *t, TypePath *path) {
} }
} }
// NOTE(bill): Align to int // NOTE(bill): Align to tag
i64 size = align_formula(max, build_context.word_size); i64 tag_size = union_tag_size(t);
i64 size = align_formula(max, tag_size);
// NOTE(bill): Calculate the padding between the common fields and the tag // NOTE(bill): Calculate the padding between the common fields and the tag
t->Union.variant_block_size = size - field_size; t->Union.variant_block_size = size - field_size;
size += type_size_of(allocator, t_int); size += tag_size;
size = align_formula(size, align); size = align_formula(size, align);
return size; return size;
} break; } break;