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

Revert "use FixedBufferAllocator in builtins"

Browse source 
This reverts commit 0c2da8686a.
This commit is contained in:
Folkert 2021-04-05 00:46:27 +02:00
parent 044f653fda
commit 0575c01f41
2 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/builtins/bitcode/src/list.zig
View file

@ -433,10 +433,7 @@ pub fn listKeepResult(list: RocList, is_good_constructor: fn (RocResult) bool, t
var output = RocList.allocate(std.heap.c_allocator, alignment, list.len(), list.len() * after_width);
const target_ptr = output.bytes orelse unreachable;
const threshold: comptime usize = 64;
var buffer: [threshold]u8 = undefined;
const buffer_allocator = &std.heap.FixedBufferAllocator.init(&buffer).allocator;
var temporary = @ptrCast([*]u8, buffer_allocator.alloc(u8, result_width) catch unreachable);
var temporary = @ptrCast([*]u8, std.heap.c_allocator.alloc(u8, result_width) catch unreachable);
var kept: usize = 0;
while (i < size) : (i += 1) {
@ -456,7 +453,7 @@ pub fn listKeepResult(list: RocList, is_good_constructor: fn (RocResult) bool, t
}
utils.decref(std.heap.c_allocator, alignment, list.bytes, size * before_width);
buffer_allocator.free(temporary[0..result_width]);
std.heap.c_allocator.free(temporary[0..result_width]);
if (kept == 0) {
utils.decref(std.heap.c_allocator, alignment, output.bytes, size * after_width);
@ -480,11 +477,7 @@ pub fn listWalk(list: RocList, stepper: Opaque, stepper_caller: Caller2, accum:
return;
}
const threshold: comptime usize = 64;
var buffer: [threshold]u8 = undefined;
const buffer_allocator = &std.heap.FixedBufferAllocator.init(&buffer).allocator;
const alloc: [*]u8 = @ptrCast([*]u8, buffer_allocator.alloc(u8, accum_width) catch unreachable);
const alloc: [*]u8 = @ptrCast([*]u8, std.heap.c_allocator.alloc(u8, accum_width) catch unreachable);
var b1 = output orelse unreachable;
var b2 = alloc;
@ -504,7 +497,7 @@ pub fn listWalk(list: RocList, stepper: Opaque, stepper_caller: Caller2, accum:
}
@memcpy(output orelse unreachable, b2, accum_width);
buffer_allocator.free(alloc[0..accum_width]);
std.heap.c_allocator.free(alloc[0..accum_width]);
const data_bytes = list.len() * element_width;
utils.decref(std.heap.c_allocator, alignment, list.bytes, data_bytes);
@ -520,11 +513,7 @@ pub fn listWalkBackwards(list: RocList, stepper: Opaque, stepper_caller: Caller2
return;
}
const threshold: comptime usize = 64;
var buffer: [threshold]u8 = undefined;
const buffer_allocator = &std.heap.FixedBufferAllocator.init(&buffer).allocator;
const alloc: [*]u8 = @ptrCast([*]u8, buffer_allocator.alloc(u8, accum_width) catch unreachable);
const alloc: [*]u8 = @ptrCast([*]u8, std.heap.c_allocator.alloc(u8, accum_width) catch unreachable);
var b1 = output orelse unreachable;
var b2 = alloc;
@ -548,7 +537,7 @@ pub fn listWalkBackwards(list: RocList, stepper: Opaque, stepper_caller: Caller2
}
@memcpy(output orelse unreachable, b2, accum_width);
buffer_allocator.free(alloc[0..accum_width]);
std.heap.c_allocator.free(alloc[0..accum_width]);
const data_bytes = list.len() * element_width;
utils.decref(std.heap.c_allocator, alignment, list.bytes, data_bytes);
@ -567,11 +556,7 @@ pub fn listWalkUntil(list: RocList, stepper: Opaque, stepper_caller: Caller2, ac
return;
}
const threshold: comptime usize = 64;
var buffer: [threshold]u8 = undefined;
const buffer_allocator = &std.heap.FixedBufferAllocator.init(&buffer).allocator;
const alloc: [*]u8 = @ptrCast([*]u8, buffer_allocator.alloc(u8, TAG_WIDTH + accum_width) catch unreachable);
const alloc: [*]u8 = @ptrCast([*]u8, std.heap.c_allocator.alloc(u8, TAG_WIDTH + accum_width) catch unreachable);
@memcpy(alloc + TAG_WIDTH, accum orelse unreachable, accum_width);
@ -595,7 +580,7 @@ pub fn listWalkUntil(list: RocList, stepper: Opaque, stepper_caller: Caller2, ac
}
@memcpy(output orelse unreachable, alloc + TAG_WIDTH, accum_width);
buffer_allocator.free(alloc[0 .. TAG_WIDTH + accum_width]);
std.heap.c_allocator.free(alloc[0 .. TAG_WIDTH + accum_width]);
const data_bytes = list.len() * element_width;
utils.decref(std.heap.c_allocator, alignment, list.bytes, data_bytes);