mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-07-22 07:31:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for map reported capacity incorrect after shrinking

Browse Source
This commit is contained in:
corley
2026-07-20 21:33:46 +03:00
parent 5a8adad68c
commit d1fd585b55
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
base/runtime/dynamic_map_internal.odin
View File

@@ -297,7 +297,8 @@ map_alloc_dynamic :: proc "odin" (info: ^Map_Info, log2_capacity: uintptr, alloc
return {}, .Out_Of_Memory
}
capacity := uintptr(1) << max(log2_capacity, MAP_MIN_LOG2_CAPACITY)
new_log2_capacity := max(log2_capacity, MAP_MIN_LOG2_CAPACITY)
capacity := uintptr(1) << new_log2_capacity
CACHE_MASK :: MAP_CACHE_LINE_SIZE - 1
@@ -312,7 +313,7 @@ map_alloc_dynamic :: proc "odin" (info: ^Map_Info, log2_capacity: uintptr, alloc
if intrinsics.expect(data_ptr & CACHE_MASK != 0, false) {
panic("allocation not aligned to a cache line", loc)
} else {
result.data = data_ptr | log2_capacity // Tagged pointer representation for capacity.
result.data = data_ptr | new_log2_capacity // Tagged pointer representation for capacity.
result.len = 0
map_clear_dynamic(&result, info)
@@ -591,10 +592,14 @@ map_shrink_dynamic :: #force_no_inline proc "odin" (#no_alias m: ^Raw_Map, #no_a
m.allocator = context.allocator
}
log2_capacity := map_log2_cap(m^)
// Don't shrink below the minimum.
if log2_capacity <= MAP_MIN_LOG2_CAPACITY {
return false, nil
}
// Cannot shrink the capacity if the number of items in the map would exceed
// one minus the current log2 capacity's resize threshold. That is the shrunk
// map needs to be within the max load factor.
log2_capacity := map_log2_cap(m^)
if uintptr(m.len) >= map_load_factor(log2_capacity - 1) {
return false, nil
}