mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-13 14:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed core library bugs after recent changes. (#257)

Browse Source 
* Fix `delete_map` calling `delete_dynamic_array` instead of `delete_slice for its hashes.

* Removed print statements from `__dynamic_map_rehash`
This commit is contained in:
Joshua Mark Manton
2018-09-02 13:18:32 -07:00
committed by Mikkel Hjortshøj
parent 11f5236434
commit 8cd2797b2e
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mem/alloc.odin
View File

@@ -64,7 +64,7 @@ delete_slice :: proc(array: $T/[]$E, allocator := context.allocator, loc := #cal
}
delete_map :: proc(m: $T/map[$K]$V, loc := #caller_location) {
raw := transmute(Raw_Map)m;
delete_dynamic_array(raw.hashes, loc);
delete_slice(raw.hashes);
free(raw.entries.data, raw.entries.allocator, loc);
}

2
core/runtime/core.odin
View File

@@ -780,8 +780,6 @@ __dynamic_map_rehash :: proc(using header: Map_Header, new_count: int, loc := #c
if m.entries.allocator.procedure != nil {
c.allocator = m.entries.allocator;
}
__print_u64(os.stdout, u64(uintptr(c.allocator.data))); os.write_byte(os.stdout, '\n');
__print_u64(os.stdout, u64(uintptr(m.entries.allocator.data))); os.write_byte(os.stdout, '\n');
context = c;
__dynamic_array_reserve(&nm.entries, entry_size, entry_align, m.entries.len, loc);