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

Modify type_set_offsets to patch minor bug

Browse Source
This commit is contained in:
gingerBill
2019-04-28 20:34:51 +01:00
parent 45fbc4e8c5
commit c61fd3a70a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_type.cpp
+1 -1
View File
@@ -2442,7 +2442,7 @@ bool check_type_internal(CheckerContext *ctx, Ast *e, Type **type, Type *named_t
case_end; case_end;
case_ast_node(ot, OpaqueType, e); case_ast_node(ot, OpaqueType, e);
Type *elem = strip_opaque_type(check_type(ctx, ot->type)); Type *elem = strip_opaque_type(check_type_expr(ctx, ot->type, nullptr));
*type = alloc_type_opaque(elem); *type = alloc_type_opaque(elem);
set_base_type(named_type, *type); set_base_type(named_type, *type);
return true; return true;
src/types.cpp
+9 -1
View File
@@ -2409,7 +2409,7 @@ i64 type_align_of_internal(Type *t, TypePath *path) {
return gb_clamp(next_pow2(type_size_of_internal(t, path)), 1, build_context.word_size); return gb_clamp(next_pow2(type_size_of_internal(t, path)), 1, build_context.word_size);
} }
Array<i64> type_set_offsets_of(Array<Entity *> fields, bool is_packed, bool is_raw_union) { Array<i64> type_set_offsets_of(Array<Entity *> const &fields, bool is_packed, bool is_raw_union) {
gbAllocator a = heap_allocator(); gbAllocator a = heap_allocator();
auto offsets = array_make<i64>(a, fields.count); auto offsets = array_make<i64>(a, fields.count);
i64 curr_offset = 0; i64 curr_offset = 0;
@@ -2442,6 +2442,7 @@ bool type_set_offsets(Type *t) {
if (!t->Struct.are_offsets_set) { if (!t->Struct.are_offsets_set) {
t->Struct.are_offsets_being_processed = true; t->Struct.are_offsets_being_processed = true;
t->Struct.offsets = type_set_offsets_of(t->Struct.fields, t->Struct.is_packed, t->Struct.is_raw_union); t->Struct.offsets = type_set_offsets_of(t->Struct.fields, t->Struct.is_packed, t->Struct.is_raw_union);
GB_ASSERT(t->Struct.offsets.count == t->Struct.fields.count);
t->Struct.are_offsets_being_processed = false; t->Struct.are_offsets_being_processed = false;
t->Struct.are_offsets_set = true; t->Struct.are_offsets_set = true;
return true; return true;
@@ -2603,7 +2604,14 @@ i64 type_size_of_internal(Type *t, TypePath *path) {
type_path_print_illegal_cycle(path, path->path.count-1); type_path_print_illegal_cycle(path, path->path.count-1);
return FAILURE_SIZE; return FAILURE_SIZE;
} }
if (t->Struct.are_offsets_set && t->Struct.offsets.count != t->Struct.fields.count) {
// TODO(bill, 2019-04-28): Determine exactly why the offsets length is different thatn the field length
// Are the the same at some point and then the struct length is increased?
// Why is this not handled by the type cycle checker?
t->Struct.are_offsets_set = false;
}
type_set_offsets(t); type_set_offsets(t);
GB_ASSERT_MSG(t->Struct.offsets.count == t->Struct.fields.count, "%s", type_to_string(t));
size = t->Struct.offsets[cast(isize)count-1] + type_size_of_internal(t->Struct.fields[cast(isize)count-1]->type, path); size = t->Struct.offsets[cast(isize)count-1] + type_size_of_internal(t->Struct.fields[cast(isize)count-1]->type, path);
return align_formula(size, align); return align_formula(size, align);
} }