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

Correct issue with the generated map type internals; Simplify map rehash logic to utilize resize

Browse Source
This commit is contained in:
gingerBill
2021-10-07 21:23:37 +01:00
parent 9ecc2ab15b
commit d386563344
5 changed files with 58 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/types.cpp
View File

@@ -3018,8 +3018,7 @@ i64 type_align_of_internal(Type *t, TypePath *path) {
} break;
case Type_Map:
init_map_internal_types(t);
return type_align_of_internal(t->Map.internal_type, path);
return build_context.word_size;
case Type_Enum:
return type_align_of_internal(t->Enum.base_type, path);
@@ -3248,11 +3247,16 @@ i64 type_size_of_internal(Type *t, TypePath *path) {
case Type_DynamicArray:
// data + len + cap + allocator(procedure+data)
return 3*build_context.word_size + 2*build_context.word_size;
return (3 + 2)*build_context.word_size;
case Type_Map:
init_map_internal_types(t);
return type_size_of_internal(t->Map.internal_type, path);
/*
struct {
hashes: []int, // 2 words
entries: [dynamic]Entry_Type, // 5 words
}
*/
return (2 + (3 + 2))*build_context.word_size;
case Type_Tuple: {
i64 count, align, size;