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

fix merge conflict

Browse source
This commit is contained in:
Folkert 2021-07-17 00:07:29 +02:00
parent daddac4e3c
commit 1f1cf180c4
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1158,7 +1158,6 @@ pub fn build_exp_expr<'a, 'ctx, 'env>(
env,
union_layout,
tag_id_type,
union_layout,
field_layouts,
*index as usize,
argument.into_pointer_value(),
@ -1200,7 +1199,6 @@ pub fn build_exp_expr<'a, 'ctx, 'env>(
env,
union_layout,
tag_id_type,
union_layout,
field_layouts,
*index as usize,
argument.into_pointer_value(),
@ -1826,7 +1824,6 @@ fn lookup_at_index_ptr2<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>,
union_layout: &UnionLayout<'a>,
tag_id_type: IntType<'ctx>,
union_layout: &UnionLayout<'a>,
field_layouts: &[Layout<'_>],
index: usize,
value: PointerValue<'ctx>,