mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-24 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into windows-llvm-13.0.0

Browse Source
This commit is contained in:
gingerBill
2022-11-29 12:20:19 +00:00
parent d086b6db54 107c7a36d0
commit 27329dd76c
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/runtime/dynamic_map_internal.odin
View File

@@ -512,11 +512,8 @@ map_reserve_dynamic :: proc "odin" (#no_alias m: ^Raw_Map, #no_alias info: ^Map_
}
}
map_free_dynamic(m^, info, loc) or_return
m.data = resized.data
return nil
return map_free_dynamic(m^, info, loc)
}
@@ -561,18 +558,19 @@ map_shrink_dynamic :: proc "odin" (#no_alias m: ^Raw_Map, #no_alias info: ^Map_I
}
}
map_free_dynamic(m^, info, loc) or_return
m.data = shrunk.data
return nil
return map_free_dynamic(m^, info, loc)
}
@(require_results)
map_free_dynamic :: proc "odin" (m: Raw_Map, info: ^Map_Info, loc := #caller_location) -> Allocator_Error {
ptr := rawptr(map_data(m))
size := int(map_total_allocation_size(uintptr(map_cap(m)), info))
return mem_free_with_size(ptr, size, m.allocator, loc)
err := mem_free_with_size(ptr, size, m.allocator, loc)
if err == .Mode_Not_Implemented {
err = nil
}
return err
}
@(require_results)
@@ -719,7 +717,7 @@ __dynamic_map_get :: proc "contextless" (#no_alias m: ^Raw_Map, #no_alias info:
// IMPORTANT: USED WITHIN THE COMPILER
__dynamic_map_check_grow :: proc "odin" (#no_alias m: ^Raw_Map, #no_alias info: ^Map_Info, loc := #caller_location) -> Allocator_Error {
if m.len >= map_resize_threshold(m^) {
if m.len >= map_resize_threshold(m^) {
return map_grow_dynamic(m, info, loc)
}
return nil
@@ -738,7 +736,7 @@ __dynamic_map_set :: proc "odin" (#no_alias m: ^Raw_Map, #no_alias info: ^Map_In
}
if __dynamic_map_check_grow(m, info, loc) != nil {
return nil
panic("HERE")
}
result := map_insert_hash_dynamic(m, info, hash, uintptr(key), uintptr(value))