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

Revert "make list inc/dec non-recursive (except when freeing the list)"

Browse source 
This reverts commit 19eadbfe70.
This commit is contained in:
Folkert 2021-10-21 20:28:32 +02:00
parent 03144f978f
commit 0a12ce896f
2 changed files with 20 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

42
compiler/gen_llvm/src/llvm/refcounting.rs
View file

@ -741,36 +741,6 @@ fn modify_refcount_list_help<'a, 'ctx, 'env>(
let (len, ptr) = load_list(env.builder, original_wrapper, ptr_type);
let refcount_ptr = PointerToRefcount::from_ptr_to_data(env, ptr);
let call_mode = mode_to_call_mode(fn_val, mode);
match mode {
Mode::Inc => {
// inc is cheap; we never recurse
refcount_ptr.modify(call_mode, layout, env);
builder.build_unconditional_branch(cont_block);
}
Mode::Dec => {
let do_recurse_block = env.context.append_basic_block(parent, "do_recurse");
let no_recurse_block = env.context.append_basic_block(parent, "no_recurse");
builder.build_conditional_branch(
refcount_ptr.is_1(env),
do_recurse_block,
no_recurse_block,
);
{
env.builder.position_at_end(no_recurse_block);
refcount_ptr.modify(call_mode, layout, env);
builder.build_unconditional_branch(cont_block);
}
{
env.builder.position_at_end(do_recurse_block);
let loop_fn = |_index, element| {
modify_refcount_layout_help(
env,
@ -784,23 +754,13 @@ fn modify_refcount_list_help<'a, 'ctx, 'env>(
};
incrementing_elem_loop(env, parent, ptr, len, "modify_rc_index", loop_fn);
builder.build_unconditional_branch(cont_block);
}
}
}
} else {
// just increment/decrement the list itself, don't touch the elements
let ptr_type = basic_type_from_layout(env, element_layout).ptr_type(AddressSpace::Generic);
let (_, ptr) = load_list(env.builder, original_wrapper, ptr_type);
let refcount_ptr = PointerToRefcount::from_ptr_to_data(env, ptr);
let refcount_ptr = PointerToRefcount::from_list_wrapper(env, original_wrapper);
let call_mode = mode_to_call_mode(fn_val, mode);
refcount_ptr.modify(call_mode, layout, env);
builder.build_unconditional_branch(cont_block);
}
builder.position_at_end(cont_block);

4
examples/benchmarks/platform/host.zig
View file

@ -77,11 +77,11 @@ export fn roc_panic(c_ptr: *c_void, tag_id: u32) callconv(.C) void {
std.process.exit(0);
}
export fn roc_memcpy(dst: [*]u8, src: [*]u8, size: usize) callconv(.C) void {
export fn roc_memcpy(dst: [*]u8, src: [*]u8, size: usize) callconv(.C) void{
return memcpy(dst, src, size);
}
export fn roc_memset(dst: [*]u8, value: i32, size: usize) callconv(.C) void {
export fn roc_memset(dst: [*]u8, value: i32, size: usize) callconv(.C) void{
return memset(dst, value, size);
}