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

Pull some shared variables higher up

Browse source
This commit is contained in:
Chad Stearns 2020-07-18 17:37:19 -04:00
parent a37f6d670b
commit 9881c91e1f
1 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1850,16 +1850,15 @@ fn run_low_level<'a, 'ctx, 'env>(
let second_list_len = load_list_len(builder, second_list_wrapper); let second_list_len = load_list_len(builder, second_list_wrapper);
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 elem_type =
basic_type_from_layout(env.arena, ctx, elem_layout, env.ptr_bytes);
match second_list_layout { match second_list_layout {
Layout::Builtin(Builtin::EmptyList) => { Layout::Builtin(Builtin::EmptyList) => {
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 (new_wrapper, _) = clone_nonempty_list( let (new_wrapper, _) = clone_nonempty_list(
env, env,
first_list_len, first_list_len,
@ -1877,14 +1876,6 @@ fn run_low_level<'a, 'ctx, 'env>(
list_is_not_empty(builder, ctx, second_list_len); list_is_not_empty(builder, ctx, second_list_len);
let build_second_list_then = || { let build_second_list_then = || {
// 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 combined_list_len = builder.build_int_add( let combined_list_len = builder.build_int_add(
first_list_len, first_list_len,
second_list_len, second_list_len,
@ -1927,8 +1918,6 @@ fn run_low_level<'a, 'ctx, 'env>(
builder.build_store(start_alloca, next_index); builder.build_store(start_alloca, next_index);
let ptr_type = get_ptr_type(&elem_type, AddressSpace::Generic);
let list_ptr = let list_ptr =
load_list_ptr(builder, first_list_wrapper, ptr_type); load_list_ptr(builder, first_list_wrapper, ptr_type);