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

Support using allocator resize in _reserve_soa (fixes #5615)

Browse Source
This commit is contained in:
Damian Tarnawski
2025-08-23 12:55:07 +02:00
parent 2b6ed996be
commit 05706864b7
2 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/runtime/core_builtin_soa.odin
+53 -7
View File
@@ -249,17 +249,63 @@ _reserve_soa :: proc(array: ^$T/#soa[dynamic]$E, capacity: int, zero_memory: boo
old_data := (^rawptr)(array)^
new_bytes := array.allocator.procedure(
array.allocator.data, .Alloc if zero_memory else .Alloc_Non_Zeroed, new_size, max_align,
nil, old_size, loc,
) or_return
new_bytes, resize_err := array.allocator.procedure(
array.allocator.data, .Resize if zero_memory else .Resize_Non_Zeroed, new_size, max_align,
old_data, old_size, loc,
)
new_data := raw_data(new_bytes)
footer.cap = capacity
old_offset := 0
new_offset := 0
if resize_err == .None {
footer.cap = capacity
// Adjust layout
// before: |x x y y z z|
// now: |x x y y z z _ _ _|
// after: |x x _ y y _ z z _|
for i in 0..<field_count {
type := si.types[i].variant.(Type_Info_Multi_Pointer).elem
old_offset = align_forward_int(old_offset, max_align)
new_offset = align_forward_int(new_offset, max_align)
new_data_elem := rawptr(uintptr(new_data) + uintptr(new_offset))
old_data_elem := rawptr(uintptr(new_data) + uintptr(old_offset))
mem_copy(new_data_elem, old_data_elem, type.size * old_cap)
(^rawptr)(uintptr(array) + i*size_of(rawptr))^ = new_data_elem
mem_zero(old_data_elem, int(uintptr(new_data_elem) - uintptr(old_data_elem)))
old_offset += type.size * old_cap
new_offset += type.size * capacity
}
return nil
}
if resize_err != .Mode_Not_Implemented {
return resize_err
}
new_bytes = array.allocator.procedure(
array.allocator.data, .Alloc if zero_memory else .Alloc_Non_Zeroed, new_size, max_align,
nil, old_size, loc,
) or_return
new_data = raw_data(new_bytes)
footer.cap = capacity
// Adjust layout
// before: |x x y y z z|
// now: |x x y y z z| ... |_ _ _ _ _ _ _ _ _|
// after: |x x _ y y _ z z _|
for i in 0..<field_count {
type := si.types[i].variant.(Type_Info_Multi_Pointer).elem