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

Catch missing areas of Map_Index usage

Browse Source
This commit is contained in:
gingerBill
2022-09-17 12:27:34 +01:00
parent b967ae2739
commit 0428d5ae2e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime/dynamic_map_internal.odin
+5 -5
View File
@@ -262,7 +262,7 @@ __dynamic_map_rehash :: proc(using header: Map_Header, new_count: int, loc := #c
__dynamic_map_get :: proc(h: Map_Header, hash: Map_Hash) -> rawptr { __dynamic_map_get :: proc(h: Map_Header, hash: Map_Hash) -> rawptr {
index := __dynamic_map_find(h, hash).entry_index index := __dynamic_map_find(h, hash).entry_index
if index >= 0 { if index != MAP_SENTINEL {
data := uintptr(__dynamic_map_get_entry(h, index)) data := uintptr(__dynamic_map_get_entry(h, index))
return rawptr(data + h.value_offset) return rawptr(data + h.value_offset)
} }
@@ -270,7 +270,7 @@ __dynamic_map_get :: proc(h: Map_Header, hash: Map_Hash) -> rawptr {
} }
__dynamic_map_set :: proc(h: Map_Header, hash: Map_Hash, value: rawptr, loc := #caller_location) -> ^Map_Entry_Header #no_bounds_check { __dynamic_map_set :: proc(h: Map_Header, hash: Map_Hash, value: rawptr, loc := #caller_location) -> ^Map_Entry_Header #no_bounds_check {
index: Map_Index index := MAP_SENTINEL
if len(h.m.hashes) == 0 { if len(h.m.hashes) == 0 {
__dynamic_map_reserve(h, INITIAL_MAP_CAP, loc) __dynamic_map_reserve(h, INITIAL_MAP_CAP, loc)
@@ -278,14 +278,14 @@ __dynamic_map_set :: proc(h: Map_Header, hash: Map_Hash, value: rawptr, loc := #
} }
fr := __dynamic_map_find(h, hash) fr := __dynamic_map_find(h, hash)
if fr.entry_index >= 0 { if fr.entry_index != MAP_SENTINEL {
index = fr.entry_index index = fr.entry_index
} else { } else {
index = __dynamic_map_add_entry(h, hash, loc) index = __dynamic_map_add_entry(h, hash, loc)
if fr.entry_prev >= 0 { if fr.entry_prev != MAP_SENTINEL {
entry := __dynamic_map_get_entry(h, fr.entry_prev) entry := __dynamic_map_get_entry(h, fr.entry_prev)
entry.next = index entry.next = index
} else if fr.hash_index >= 0 { } else if fr.hash_index != MAP_SENTINEL {
h.m.hashes[fr.hash_index] = index h.m.hashes[fr.hash_index] = index
} else { } else {
return nil return nil