roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-22 00:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix another merge conflict

Browse Source
This commit is contained in:
Folkert 2022-03-10 21:38:31 +01:00
parent be214b7931
commit d222be95b3
No known key found for this signature in database
GPG Key ID: 1F17F6FFD112B97C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/gen_llvm/src/llvm/compare.rs
View File

@ -1301,7 +1301,7 @@ fn build_box_eq<'a, 'ctx, 'env>(
let function = match env.module.get_function(fn_name.as_str()) {
Some(function_value) => function_value,
None => {
let arg_type = basic_type_from_layout_1(env, box_layout);
let arg_type = basic_type_from_layout(env, box_layout);
let function_value = crate::llvm::refcounting::build_header_help(
env,

2
compiler/gen_llvm/src/llvm/convert.rs
View File

@ -35,7 +35,7 @@ pub fn basic_type_from_layout<'a, 'ctx, 'env>(
} => basic_type_from_record(env, sorted_fields),
LambdaSet(lambda_set) => basic_type_from_layout(env, &lambda_set.runtime_representation()),
Boxed(inner_layout) => {
let inner_type = basic_type_from_layout_1(env, inner_layout);
let inner_type = basic_type_from_layout(env, inner_layout);
inner_type.ptr_type(AddressSpace::Generic).into()
}