fix another merge conflict

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

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,