diff options
| author | gingerBill <bill@gingerbill.org> | 2020-04-12 10:41:44 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2020-04-12 10:41:44 +0100 |
| commit | 9e698b720f4f26341db81b70ea5f70f5bdfd9e3a (patch) | |
| tree | 61f09e4ea24b8e0441e77fc0c62b3ed8ea56e3c9 /core | |
| parent | 5157619eb7d0ab40d54cbc0562cc3ce4a5526e81 (diff) | |
Change behaviour for zero-sized value types of array-related types; Fix make behaviour to always zero memory
Diffstat (limited to 'core')
| -rw-r--r-- | core/mem/alloc.odin | 8 | ||||
| -rw-r--r-- | core/runtime/core.odin | 26 |
2 files changed, 23 insertions, 11 deletions
diff --git a/core/mem/alloc.odin b/core/mem/alloc.odin index 767e59183..fda7862c3 100644 --- a/core/mem/alloc.odin +++ b/core/mem/alloc.odin @@ -111,7 +111,10 @@ make_slice :: inline proc($T: typeid/[]$E, auto_cast len: int, allocator := cont make_aligned :: proc($T: typeid/[]$E, auto_cast len: int, alignment: int, allocator := context.allocator, loc := #caller_location) -> T { runtime.make_slice_error_loc(loc, len); data := alloc(size_of(E)*len, alignment, allocator, loc); - if data == nil do return nil; + if data == nil && size_of(E) != 0 { + return nil; + } + zero(data, size_of(E)*len); s := Raw_Slice{data, len}; return transmute(T)s; } @@ -125,9 +128,10 @@ make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, auto_cast len: int, a runtime.make_dynamic_array_error_loc(loc, len, cap); data := alloc(size_of(E)*cap, align_of(E), allocator, loc); s := Raw_Dynamic_Array{data, len, cap, allocator}; - if data == nil { + if data == nil && size_of(E) != 0 { s.len, s.cap = 0, 0; } + zero(data, size_of(E)*len); return transmute(T)s; } make_map :: proc($T: typeid/map[$K]$E, auto_cast cap: int = 16, allocator := context.allocator, loc := #caller_location) -> T { diff --git a/core/runtime/core.odin b/core/runtime/core.odin index d906c28b7..b66f43788 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -609,7 +609,10 @@ new_clone :: inline proc(data: $T, allocator := context.allocator, loc := #calle make_aligned :: proc($T: typeid/[]$E, auto_cast len: int, alignment: int, allocator := context.allocator, loc := #caller_location) -> T { make_slice_error_loc(loc, len); data := mem_alloc(size_of(E)*len, alignment, allocator, loc); - if data == nil do return nil; + if data == nil && size_of(E) != 0 { + return nil; + } + mem_zero(data, size_of(E)*len); s := Raw_Slice{data, len}; return transmute(T)s; } @@ -634,9 +637,10 @@ make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, auto_cast len: int, a make_dynamic_array_error_loc(loc, len, cap); data := mem_alloc(size_of(E)*cap, align_of(E), allocator, loc); s := Raw_Dynamic_Array{data, len, cap, allocator}; - if data == nil { + if data == nil && size_of(E) != 0 { s.len, s.cap = 0, 0; } + mem_zero(data, size_of(E)*cap); return transmute(T)s; } @@ -697,10 +701,12 @@ append_elem :: proc(array: ^$T/[dynamic]$E, arg: E, loc := #caller_location) { arg_len = min(cap(array)-len(array), arg_len); if arg_len > 0 { a := (^Raw_Dynamic_Array)(array); - data := (^E)(a.data); - assert(data != nil); - val := arg; - mem_copy(ptr_offset(data, a.len), &val, size_of(E)); + if size_of(E) != 0 { + data := (^E)(a.data); + assert(data != nil); + val := arg; + mem_copy(ptr_offset(data, a.len), &val, size_of(E)); + } a.len += arg_len; } } @@ -719,9 +725,11 @@ append_elems :: proc(array: ^$T/[dynamic]$E, args: ..E, loc := #caller_location) arg_len = min(cap(array)-len(array), arg_len); if arg_len > 0 { a := (^Raw_Dynamic_Array)(array); - data := (^E)(a.data); - assert(data != nil); - mem_copy(ptr_offset(data, a.len), &args[0], size_of(E) * arg_len); + if size_of(E) != 0 { + data := (^E)(a.data); + assert(data != nil); + mem_copy(ptr_offset(data, a.len), &args[0], size_of(E) * arg_len); + } a.len += arg_len; } } |