This commit is contained in:
Folkert 2021-02-17 23:45:36 +01:00
parent 27dc420617
commit 5501580fb3
2 changed files with 10 additions and 20 deletions

View file

@ -3633,9 +3633,7 @@ fn run_low_level<'a, 'ctx, 'env>(
let (func, func_layout) = load_symbol_and_layout(scope, &args[1]); let (func, func_layout) = load_symbol_and_layout(scope, &args[1]);
match list_layout { match list_layout {
Layout::Builtin(Builtin::EmptyList) => { Layout::Builtin(Builtin::EmptyList) => empty_list(env),
return empty_list(env);
}
Layout::Builtin(Builtin::List(_, element_layout)) => { Layout::Builtin(Builtin::List(_, element_layout)) => {
list_map(env, layout_ids, func, func_layout, list, element_layout) list_map(env, layout_ids, func, func_layout, list, element_layout)
} }
@ -3651,9 +3649,7 @@ fn run_low_level<'a, 'ctx, 'env>(
let (func, func_layout) = load_symbol_and_layout(scope, &args[1]); let (func, func_layout) = load_symbol_and_layout(scope, &args[1]);
match list_layout { match list_layout {
Layout::Builtin(Builtin::EmptyList) => { Layout::Builtin(Builtin::EmptyList) => empty_list(env),
return empty_list(env);
}
Layout::Builtin(Builtin::List(_, element_layout)) => { Layout::Builtin(Builtin::List(_, element_layout)) => {
list_map_with_index(env, layout_ids, func, func_layout, list, element_layout) list_map_with_index(env, layout_ids, func, func_layout, list, element_layout)
} }
@ -3669,9 +3665,7 @@ fn run_low_level<'a, 'ctx, 'env>(
let (func, func_layout) = load_symbol_and_layout(scope, &args[1]); let (func, func_layout) = load_symbol_and_layout(scope, &args[1]);
match list_layout { match list_layout {
Layout::Builtin(Builtin::EmptyList) => { Layout::Builtin(Builtin::EmptyList) => empty_list(env),
return empty_list(env);
}
Layout::Builtin(Builtin::List(_, element_layout)) => { Layout::Builtin(Builtin::List(_, element_layout)) => {
list_keep_if(env, layout_ids, func, func_layout, list, element_layout) list_keep_if(env, layout_ids, func, func_layout, list, element_layout)
} }
@ -3688,9 +3682,7 @@ fn run_low_level<'a, 'ctx, 'env>(
match (list_layout, layout) { match (list_layout, layout) {
(_, Layout::Builtin(Builtin::EmptyList)) (_, Layout::Builtin(Builtin::EmptyList))
| (Layout::Builtin(Builtin::EmptyList), _) => { | (Layout::Builtin(Builtin::EmptyList), _) => empty_list(env),
return empty_list(env);
}
( (
Layout::Builtin(Builtin::List(_, before_layout)), Layout::Builtin(Builtin::List(_, before_layout)),
Layout::Builtin(Builtin::List(_, after_layout)), Layout::Builtin(Builtin::List(_, after_layout)),
@ -3718,9 +3710,7 @@ fn run_low_level<'a, 'ctx, 'env>(
match (list_layout, layout) { match (list_layout, layout) {
(_, Layout::Builtin(Builtin::EmptyList)) (_, Layout::Builtin(Builtin::EmptyList))
| (Layout::Builtin(Builtin::EmptyList), _) => { | (Layout::Builtin(Builtin::EmptyList), _) => empty_list(env),
return empty_list(env);
}
( (
Layout::Builtin(Builtin::List(_, before_layout)), Layout::Builtin(Builtin::List(_, before_layout)),
Layout::Builtin(Builtin::List(_, after_layout)), Layout::Builtin(Builtin::List(_, after_layout)),

View file

@ -947,7 +947,7 @@ fn list_walk_generic<'a, 'ctx, 'env>(
call_void_bitcode_fn( call_void_bitcode_fn(
env, env,
&[ &[
list_i128.into(), list_i128,
env.builder env.builder
.build_bitcast(transform_ptr, u8_ptr, "to_opaque"), .build_bitcast(transform_ptr, u8_ptr, "to_opaque"),
stepper_caller.into(), stepper_caller.into(),
@ -989,7 +989,7 @@ pub fn list_contains<'a, 'ctx, 'env>(
call_bitcode_fn( call_bitcode_fn(
env, env,
&[ &[
list_i128.into(), list_i128,
env.builder.build_bitcast(key_ptr, u8_ptr, "to_u8_ptr"), env.builder.build_bitcast(key_ptr, u8_ptr, "to_u8_ptr"),
element_width.into(), element_width.into(),
eq_fn.as_global_value().as_pointer_value().into(), eq_fn.as_global_value().as_pointer_value().into(),
@ -1031,7 +1031,7 @@ pub fn list_keep_if<'a, 'ctx, 'env>(
let output = call_bitcode_fn( let output = call_bitcode_fn(
env, env,
&[ &[
list_i128.into(), list_i128,
env.builder env.builder
.build_bitcast(transform_ptr, u8_ptr, "to_opaque"), .build_bitcast(transform_ptr, u8_ptr, "to_opaque"),
stepper_caller.into(), stepper_caller.into(),
@ -1141,7 +1141,7 @@ pub fn list_keep_result<'a, 'ctx, 'env>(
let output = call_bitcode_fn( let output = call_bitcode_fn(
env, env,
&[ &[
list_i128.into(), list_i128,
env.builder env.builder
.build_bitcast(transform_ptr, u8_ptr, "to_opaque"), .build_bitcast(transform_ptr, u8_ptr, "to_opaque"),
stepper_caller.into(), stepper_caller.into(),
@ -1247,7 +1247,7 @@ fn list_map_generic<'a, 'ctx, 'env>(
let output = call_bitcode_fn( let output = call_bitcode_fn(
env, env,
&[ &[
list_i128.into(), list_i128,
env.builder env.builder
.build_bitcast(transform_ptr, u8_ptr, "to_opaque"), .build_bitcast(transform_ptr, u8_ptr, "to_opaque"),
stepper_caller.into(), stepper_caller.into(),