language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Have realloc take old_size too

Browse source 
After all, we always know it, and it means host authors don't
necessarily have to store it.
This commit is contained in:
Richard Feldman 2021-05-22 22:39:23 -04:00
parent ab51582541
commit 64dbf5a777
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/builtins/bitcode/src/utils.zig
View file

@ -6,7 +6,7 @@ extern fn roc_alloc(alignment: usize, size: usize) callconv(.C) *c_void;
// This should never be passed a null pointer. // This should never be passed a null pointer.
// If allocation fails, this must cxa_throw - it must not return a null pointer! // If allocation fails, this must cxa_throw - it must not return a null pointer!
extern fn roc_realloc(alignment: usize, c_ptr: *c_void, new_size: usize) callconv(.C) *c_void; extern fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) *c_void;
// This should never be passed a null pointer. // This should never be passed a null pointer.
extern fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void; extern fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void;
@ -18,10 +18,10 @@ pub fn alloc(alignment: usize, size: usize) [*]u8 {
); );
} }
pub fn realloc(alignment: usize, c_ptr: [*]u8, new_size: usize) [*]u8 { pub fn realloc(alignment: usize, c_ptr: [*]u8, old_size: usize, new_size: usize) [*]u8 {
return @ptrCast( return @ptrCast(
[*]u8, [*]u8,
@call(.{ .modifier = always_inline }, roc_realloc, .{ alignment, c_ptr, new_size }) @call(.{ .modifier = always_inline }, roc_realloc, .{ alignment, c_ptr, old_size, new_size })
); );
} }
@ -195,7 +195,7 @@ pub fn unsafeReallocate(
// TODO handle out of memory // TODO handle out of memory
// NOTE realloc will dealloc the original allocation // NOTE realloc will dealloc the original allocation
const old_allocation = source_ptr - align_width; const old_allocation = source_ptr - align_width;
const new_allocation = realloc(alignment, old_allocation, new_width); const new_allocation = realloc(alignment, old_allocation, old_width, new_width);
const new_source = @ptrCast([*]u8, new_allocation) + align_width; const new_source = @ptrCast([*]u8, new_allocation) + align_width;
return new_source; return new_source;