language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 12:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Correct sizes when allocating lists from rust

Browse source
This commit is contained in:
Brendan Hansknecht 2024-04-06 22:43:46 -07:00
parent a1d08702a4
commit e2dc112f86
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/roc_std/src/roc_list.rs
View file

@ -81,8 +81,7 @@ where
/// returns the number of bytes needed to allocate, taking into account both the
/// size of the elements as well as the size of Storage.
fn alloc_bytes(num_elems: usize) -> usize {
next_multiple_of(mem::size_of::<Storage>(), mem::align_of::<T>())
+ (num_elems * mem::size_of::<T>())
Self::alloc_to_elem_offset() + (num_elems * mem::size_of::<T>())
}
fn elems_with_capacity(num_elems: usize) -> NonNull<ManuallyDrop<T>> {
@ -328,14 +327,14 @@ where
if is_unique {
// If we have enough capacity, we can add to the existing elements in-place.
if self.capacity() >= slice.len() {
if self.capacity() >= new_len {
elements
} else {
// There wasn't enough capacity, so we need a new allocation.
// Since this is a unique RocList, we can use realloc here.
let new_ptr = unsafe {
roc_realloc(
storage.as_ptr().cast(),
self.ptr_to_allocation(),
Self::alloc_bytes(new_len),
Self::alloc_bytes(self.capacity()),
Self::alloc_alignment() as u32,