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

fix merge error

Browse source
This commit is contained in:
Folkert 2022-03-31 21:09:19 +02:00
parent 2c8d58329c
commit 426aa13e13
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/gen_llvm/src/llvm/build_dict.rs
View file

@ -21,6 +21,7 @@ use roc_target::TargetInfo;
use super::bitcode::call_list_bitcode_fn; use super::bitcode::call_list_bitcode_fn;
use super::build::store_roc_value; use super::build::store_roc_value;
use super::build_list::list_to_c_abi;
#[repr(transparent)] #[repr(transparent)]
struct Alignment(u8); struct Alignment(u8);
@ -714,7 +715,7 @@ pub fn set_from_list<'a, 'ctx, 'env>(
call_void_bitcode_fn( call_void_bitcode_fn(
env, env,
&[ &[
list, list_to_c_abi(env, list).into(),
alignment_iv.into(), alignment_iv.into(),
key_width.into(), key_width.into(),
value_width.into(), value_width.into(),