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

Fix behaviour for make to return nil when alloc returns nil

Browse Source
This commit is contained in:
gingerBill
2020-01-03 10:17:30 +00:00
parent d0ca045586
commit b8324b0776
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/alloc.odin
+2
View File
@@ -111,6 +111,7 @@ 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 { 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); runtime.make_slice_error_loc(loc, len);
data := alloc(size_of(E)*len, alignment, allocator, loc); data := alloc(size_of(E)*len, alignment, allocator, loc);
if data == nil do return nil;
s := Raw_Slice{data, len}; s := Raw_Slice{data, len};
return transmute(T)s; return transmute(T)s;
} }
@@ -123,6 +124,7 @@ make_dynamic_array_len :: proc($T: typeid/[dynamic]$E, auto_cast len: int, alloc
make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, auto_cast len: int, auto_cast cap: int, allocator := context.allocator, loc := #caller_location) -> T { make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, auto_cast len: int, auto_cast cap: int, allocator := context.allocator, loc := #caller_location) -> T {
runtime.make_dynamic_array_error_loc(loc, len, cap); runtime.make_dynamic_array_error_loc(loc, len, cap);
data := alloc(size_of(E)*cap, align_of(E), allocator, loc); data := alloc(size_of(E)*cap, align_of(E), allocator, loc);
if data == nil do return nil;
s := Raw_Dynamic_Array{data, len, cap, allocator}; s := Raw_Dynamic_Array{data, len, cap, allocator};
return transmute(T)s; return transmute(T)s;
} }
core/runtime/core.odin
+2
View File
@@ -604,6 +604,7 @@ 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_aligned :: proc($T: typeid/[]$E, auto_cast len: int, alignment: int, allocator := context.allocator, loc := #caller_location) -> T {
make_slice_error_loc(loc, len); make_slice_error_loc(loc, len);
data := mem_alloc(size_of(E)*len, alignment, allocator, loc); data := mem_alloc(size_of(E)*len, alignment, allocator, loc);
if data == nil do return nil;
s := Raw_Slice{data, len}; s := Raw_Slice{data, len};
return transmute(T)s; return transmute(T)s;
} }
@@ -627,6 +628,7 @@ make_dynamic_array_len :: proc($T: typeid/[dynamic]$E, auto_cast len: int, alloc
make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, auto_cast len: int, auto_cast cap: int, allocator := context.allocator, loc := #caller_location) -> T { make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, auto_cast len: int, auto_cast cap: int, allocator := context.allocator, loc := #caller_location) -> T {
make_dynamic_array_error_loc(loc, len, cap); make_dynamic_array_error_loc(loc, len, cap);
data := mem_alloc(size_of(E)*cap, align_of(E), allocator, loc); data := mem_alloc(size_of(E)*cap, align_of(E), allocator, loc);
if data == nil do return nil;
s := Raw_Dynamic_Array{data, len, cap, allocator}; s := Raw_Dynamic_Array{data, len, cap, allocator};
return transmute(T)s; return transmute(T)s;
} }