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

Merge pull request #545 from Tetralux/patch-2

Browse Source 
Fix `make(map[K]V, 0)` by ensuring `reserve` always sets an allocator
This commit is contained in:
gingerBill
2020-01-26 16:19:50 +00:00
committed by GitHub
parent 14c4fed94c abe8789890
commit d658a8fca5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/runtime/core.odin
View File

@@ -1125,12 +1125,14 @@ __dynamic_array_make :: proc(array_: rawptr, elem_size, elem_align: int, len, ca
__dynamic_array_reserve :: proc(array_: rawptr, elem_size, elem_align: int, cap: int, loc := #caller_location) -> bool {
array := (^Raw_Dynamic_Array)(array_);
if cap <= array.cap do return true;
// NOTE(tetra, 2020-01-26): We set the allocator before earlying-out below, because user code is usually written
// assuming that appending/reserving will set the allocator, if it is not already set.
if array.allocator.procedure == nil {
array.allocator = context.allocator;
}
assert(array.allocator.procedure != nil);
if cap <= array.cap do return true;
old_size := array.cap * elem_size;
new_size := cap * elem_size;