mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-30 15:21:12 +00:00
WIP
This commit is contained in:
parent
90c281fdd7
commit
0531d91301
2 changed files with 102 additions and 4 deletions
|
@ -1402,6 +1402,7 @@ fn call_with_args<'a, 'ctx, 'env>(
|
||||||
Symbol::FLOAT_ROUND => call_intrinsic(LLVM_LROUND_I64_F64, env, args),
|
Symbol::FLOAT_ROUND => call_intrinsic(LLVM_LROUND_I64_F64, env, args),
|
||||||
Symbol::LIST_SET => list_set(parent, args, env, InPlace::Clone),
|
Symbol::LIST_SET => list_set(parent, args, env, InPlace::Clone),
|
||||||
Symbol::LIST_SET_IN_PLACE => list_set(parent, args, env, InPlace::InPlace),
|
Symbol::LIST_SET_IN_PLACE => list_set(parent, args, env, InPlace::InPlace),
|
||||||
|
Symbol::LIST_PUSH => list_push(parent, args, env, InPlace::Clone),
|
||||||
Symbol::LIST_SINGLE => {
|
Symbol::LIST_SINGLE => {
|
||||||
// List.single : a -> List a
|
// List.single : a -> List a
|
||||||
debug_assert!(args.len() == 1);
|
debug_assert!(args.len() == 1);
|
||||||
|
@ -1648,6 +1649,103 @@ fn bounds_check_comparison<'ctx>(
|
||||||
builder.build_int_compare(IntPredicate::ULT, elem_index, len, "bounds_check")
|
builder.build_int_compare(IntPredicate::ULT, elem_index, len, "bounds_check")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn list_push<'a, 'ctx, 'env>(
|
||||||
|
parent: FunctionValue<'ctx>,
|
||||||
|
args: &[(BasicValueEnum<'ctx>, &'a Layout<'a>)],
|
||||||
|
env: &Env<'a, 'ctx, 'env>,
|
||||||
|
in_place: InPlace,
|
||||||
|
) -> BasicValueEnum<'ctx> {
|
||||||
|
// List.push List elem, elem -> List elem
|
||||||
|
let builder = env.builder;
|
||||||
|
let ctx = env.context;
|
||||||
|
|
||||||
|
debug_assert!(args.len() == 2);
|
||||||
|
|
||||||
|
let original_wrapper = args[1].0.into_struct_value();
|
||||||
|
|
||||||
|
// Load the usize length from the wrapper. We need it for bounds checking.
|
||||||
|
let list_len = load_list_len(builder, original_wrapper);
|
||||||
|
|
||||||
|
let (elem, elem_layout) = args[1];
|
||||||
|
let elem_type = basic_type_from_layout(env.arena, ctx, elem_layout, env.ptr_bytes);
|
||||||
|
let ptr_type = get_ptr_type(&elem_type, AddressSpace::Generic);
|
||||||
|
|
||||||
|
let elems_ptr = load_list_ptr(builder, original_wrapper, ptr_type);
|
||||||
|
|
||||||
|
let new_list_len = env.builder.build_int_add(
|
||||||
|
ctx.i32_type().const_int(
|
||||||
|
// 0 as in 0 index of our new list
|
||||||
|
1 as u64, false,
|
||||||
|
),
|
||||||
|
list_len,
|
||||||
|
"add_i64",
|
||||||
|
);
|
||||||
|
|
||||||
|
let ctx = env.context;
|
||||||
|
let ptr_bytes = env.ptr_bytes;
|
||||||
|
|
||||||
|
// Calculate the number of bytes we'll need to allocate.
|
||||||
|
let elem_bytes = env
|
||||||
|
.ptr_int()
|
||||||
|
.const_int(elem_layout.stack_size(env.ptr_bytes) as u64, false);
|
||||||
|
let size = env
|
||||||
|
.builder
|
||||||
|
.build_int_mul(elem_bytes, new_list_len, "mul_len_by_elem_bytes");
|
||||||
|
|
||||||
|
// Allocate space for the new array that we'll copy into.
|
||||||
|
let elem_type = basic_type_from_layout(env.arena, ctx, elem_layout, env.ptr_bytes);
|
||||||
|
let clone_ptr = builder
|
||||||
|
.build_array_malloc(elem_type, new_list_len, "list_ptr")
|
||||||
|
.unwrap();
|
||||||
|
let int_type = ptr_int(ctx, ptr_bytes);
|
||||||
|
let ptr_as_int = builder.build_ptr_to_int(clone_ptr, int_type, "list_cast_ptr");
|
||||||
|
|
||||||
|
// TODO check if malloc returned null; if so, runtime error for OOM!
|
||||||
|
|
||||||
|
// Either memcpy or deep clone the array elements
|
||||||
|
if elem_layout.safe_to_memcpy() {
|
||||||
|
// Copy the bytes from the original array into the new
|
||||||
|
// one we just malloc'd.
|
||||||
|
//
|
||||||
|
// TODO how do we decide when to do the small memcpy vs the normal one?
|
||||||
|
builder.build_memcpy(clone_ptr, ptr_bytes, elems_ptr, ptr_bytes, size);
|
||||||
|
} else {
|
||||||
|
panic!("TODO Cranelift currently only knows how to clone list elements that are Copy.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a fresh wrapper struct for the newly populated array
|
||||||
|
let struct_type = collection(ctx, env.ptr_bytes);
|
||||||
|
let mut struct_val;
|
||||||
|
|
||||||
|
// Store the pointer
|
||||||
|
struct_val = builder
|
||||||
|
.build_insert_value(
|
||||||
|
struct_type.get_undef(),
|
||||||
|
ptr_as_int,
|
||||||
|
Builtin::WRAPPER_PTR,
|
||||||
|
"insert_ptr",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// Store the length
|
||||||
|
struct_val = builder
|
||||||
|
.build_insert_value(struct_val, list_len, Builtin::WRAPPER_LEN, "insert_len")
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let answer = builder.build_bitcast(
|
||||||
|
struct_val.into_struct_value(),
|
||||||
|
collection(ctx, ptr_bytes),
|
||||||
|
"cast_collection",
|
||||||
|
);
|
||||||
|
|
||||||
|
let elem_ptr = unsafe { builder.build_in_bounds_gep(clone_ptr, &[list_len], "load_index") };
|
||||||
|
|
||||||
|
// Mutate the new array in-place to change the element.
|
||||||
|
builder.build_store(elem_ptr, elem);
|
||||||
|
|
||||||
|
answer
|
||||||
|
}
|
||||||
|
|
||||||
fn list_set<'a, 'ctx, 'env>(
|
fn list_set<'a, 'ctx, 'env>(
|
||||||
parent: FunctionValue<'ctx>,
|
parent: FunctionValue<'ctx>,
|
||||||
args: &[(BasicValueEnum<'ctx>, &'a Layout<'a>)],
|
args: &[(BasicValueEnum<'ctx>, &'a Layout<'a>)],
|
||||||
|
|
|
@ -489,10 +489,10 @@ mod gen_builtins {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[test]
|
#[test]
|
||||||
// fn list_push() {
|
fn list_push() {
|
||||||
// assert_evals_to!("List.push [] 1", &[1], &'static [i64]);
|
assert_evals_to!("List.push [1] 2", &[1, 2], &'static [i64]);
|
||||||
// }
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn list_single() {
|
fn list_single() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue