diff options
| author | Joshua Mark Manton <joshuamarkk@gmail.com> | 2018-09-02 13:18:32 -0700 |
|---|---|---|
| committer | Mikkel Hjortshøj <fyoucon@gmail.com> | 2018-09-02 22:18:32 +0200 |
| commit | 8cd2797b2e153d780e9dec2c600ae88f92431f2e (patch) | |
| tree | 31552643bead89cae74d9280d9e03cc561345595 | |
| parent | 11f5236434ca08ae034a195639c8ed377e125015 (diff) | |
Fixed core library bugs after recent changes. (#257)
* Fix `delete_map` calling `delete_dynamic_array` instead of `delete_slice for its hashes.
* Removed print statements from `__dynamic_map_rehash`
| -rw-r--r-- | core/mem/alloc.odin | 2 | ||||
| -rw-r--r-- | core/runtime/core.odin | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/mem/alloc.odin b/core/mem/alloc.odin index e4357fe18..fa2f73767 100644 --- a/core/mem/alloc.odin +++ b/core/mem/alloc.odin @@ -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); } diff --git a/core/runtime/core.odin b/core/runtime/core.odin index fb428d8fe..4e3ef0c18 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -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); |