llvm yells now

This commit is contained in:
lrosa007 2020-11-04 21:56:42 -05:00
parent 9269f1d8a7
commit deb249bdb4

View file

@ -864,14 +864,16 @@ pub fn list_contains_help<'a, 'ctx, 'env>(
elem_layout: &Layout<'a>, elem_layout: &Layout<'a>,
) -> BasicValueEnum<'ctx> { ) -> BasicValueEnum<'ctx> {
match (elem, elem_layout) { match (elem, elem_layout) {
(BasicValueEnum::PointerValue(_), Layout::Pointer(_)) => { (BasicValueEnum::IntValue(_), _) => {
let builder = env.builder; let builder = env.builder;
let ctx = env.context; let ctx = env.context;
let bool_alloca = builder.build_alloca(ctx.bool_type(), "bool_alloca");
let index_alloca = builder.build_alloca(ctx.i64_type(), "index_alloca"); let index_alloca = builder.build_alloca(ctx.i64_type(), "index_alloca");
let next_free_index_alloca = let next_free_index_alloca =
builder.build_alloca(ctx.i64_type(), "next_free_index_alloca"); builder.build_alloca(ctx.i64_type(), "next_free_index_alloca");
builder.build_store(bool_alloca, ctx.bool_type().const_zero());
builder.build_store(index_alloca, ctx.i64_type().const_zero()); builder.build_store(index_alloca, ctx.i64_type().const_zero());
builder.build_store(next_free_index_alloca, ctx.i64_type().const_zero()); builder.build_store(next_free_index_alloca, ctx.i64_type().const_zero());
@ -897,11 +899,7 @@ pub fn list_contains_help<'a, 'ctx, 'env>(
let has_found = build_eq(env, current_elem, elem, elem_layout, elem_layout); let has_found = build_eq(env, current_elem, elem, elem_layout, elem_layout);
let keep_going_bb = ctx.append_basic_block(parent, "loop"); builder.build_store(bool_alloca, has_found.into_int_value());
let stop_bb = ctx.append_basic_block(parent, "break");
builder.build_conditional_branch(has_found.into_int_value(), stop_bb, keep_going_bb);
builder.position_at_end(stop_bb);
let one = ctx.i64_type().const_int(1, false); let one = ctx.i64_type().const_int(1, false);
@ -914,9 +912,6 @@ pub fn list_contains_help<'a, 'ctx, 'env>(
builder.build_int_add(next_free_index, one, "incremented_next_free_index"), builder.build_int_add(next_free_index, one, "incremented_next_free_index"),
); );
builder.build_unconditional_branch(keep_going_bb);
builder.position_at_end(keep_going_bb);
builder.build_store( builder.build_store(
index_alloca, index_alloca,
builder.build_int_add(index, one, "incremented_index"), builder.build_int_add(index, one, "incremented_index"),
@ -924,13 +919,15 @@ pub fn list_contains_help<'a, 'ctx, 'env>(
builder.build_unconditional_branch(condition_bb); builder.build_unconditional_branch(condition_bb);
builder.build_conditional_branch(has_found.into_int_value(), cont_bb, condition_bb);
// continuation // continuation
builder.position_at_end(cont_bb); builder.position_at_end(cont_bb);
has_found builder.build_load(bool_alloca, "answer")
} }
_ => unreachable!( _ => unreachable!(
"Invalid element basic value enum or layout for List.keepIf : {:?}", "Invalid element basic value enum or layout for List.contains : {:?}",
(elem, elem_layout) (elem, elem_layout)
), ),
} }