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

Fix the type of inner_list_ptr

Browse source
This commit is contained in:
Richard Feldman 2020-08-02 15:08:03 -04:00
parent 450c36e3c5
commit 6241578831
1 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
compiler/gen/src/llvm/build.rs
View file

@ -1537,7 +1537,7 @@ fn list_append<'a, 'ctx, 'env>(
fn list_join<'a, 'ctx, 'env>( fn list_join<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>, env: &Env<'a, 'ctx, 'env>,
parent: FunctionValue<'ctx>, parent: FunctionValue<'ctx>,
outer_wrapper_struct: StructValue<'ctx>, outer_list_wrapper: StructValue<'ctx>,
outer_list_layout: &Layout<'a>, outer_list_layout: &Layout<'a>,
) -> BasicValueEnum<'ctx> { ) -> BasicValueEnum<'ctx> {
match outer_list_layout { match outer_list_layout {
@ -1555,22 +1555,14 @@ fn list_join<'a, 'ctx, 'env>(
let inner_list_type = let inner_list_type =
basic_type_from_layout(env.arena, ctx, &inner_list_layout, env.ptr_bytes); basic_type_from_layout(env.arena, ctx, &inner_list_layout, env.ptr_bytes);
let outer_list_type = let outer_list_len = load_list_len(builder, outer_list_wrapper);
basic_type_from_layout(env.arena, ctx, &outer_list_layout, env.ptr_bytes);
let outer_list_len = load_list_len(builder, outer_wrapper_struct);
let outer_list_ptr = { let outer_list_ptr = {
let ptr_type = get_ptr_type(&outer_list_type, AddressSpace::Generic); let elem_ptr_type = get_ptr_type(&inner_list_type, AddressSpace::Generic);
load_list_ptr(builder, outer_wrapper_struct, ptr_type) load_list_ptr(builder, outer_list_wrapper, elem_ptr_type)
}; };
let dest_elem_ptr_name = "#destelem"; let dest_elem_ptr_alloca = builder.build_alloca(elem_ptr_type, "dest_elem");
let dest_elem_ptr_alloca = builder.build_alloca(
get_ptr_type(&elem_type, AddressSpace::Generic),
dest_elem_ptr_name,
);
// outer_list_len > 0 // outer_list_len > 0
// We do this check to avoid allocating memory. If the input // We do this check to avoid allocating memory. If the input
@ -1612,11 +1604,19 @@ fn list_join<'a, 'ctx, 'env>(
builder.build_store(index_alloca, next_index); builder.build_store(index_alloca, next_index);
// The pointer to the list in the outer list (the list of lists) // The pointer to the list in the outer list (the list of lists)
let inner_list_ptr = unsafe { let inner_list_ptr = {
builder.build_in_bounds_gep(outer_list_ptr, &[curr_index], "load_index") let wrapper_ptr = unsafe {
builder.build_in_bounds_gep(outer_list_ptr, &[curr_index], "load_index")
};
let wrapper = builder
.build_load(wrapper_ptr, "inner_list_wrapper")
.into_struct_value();
let elem_ptr_type = get_ptr_type(&elem_type, AddressSpace::Generic);
load_list_ptr(builder, wrapper, elem_ptr_type)
}; };
let inner_list = builder.build_load(inner_list_ptr, "get_elem"); let inner_list = builder.build_load(inner_list_ptr, "inner_list");
let inner_list_len = load_list_len(builder, inner_list.into_struct_value()); let inner_list_len = load_list_len(builder, inner_list.into_struct_value());
let next_list_sum = builder.build_int_add( let next_list_sum = builder.build_int_add(
@ -1682,12 +1682,17 @@ fn list_join<'a, 'ctx, 'env>(
builder.build_store(index_alloca, next_index); builder.build_store(index_alloca, next_index);
// The pointer to the list in the outer list (the list of lists) // The pointer to the list in the outer list (the list of lists)
let inner_list_ptr = unsafe { let inner_list_ptr = {
builder.build_in_bounds_gep(outer_list_ptr, &[curr_index], "load_index") let wrapper_ptr = unsafe {
}; builder.build_in_bounds_gep(outer_list_ptr, &[curr_index], "load_index")
};
let wrapper = builder
.build_load(wrapper_ptr, "inner_list_wrapper")
.into_struct_value();
let elem_ptr_type = get_ptr_type(&elem_type, AddressSpace::Generic);
let inner_list = builder.build_load(inner_list_ptr, "get_elem"); load_list_ptr(builder, wrapper, elem_ptr_type)
let inner_list_len = load_list_len(builder, inner_list.into_struct_value()); };
// Inner Loop // Inner Loop
{ {