From 15033eab28d8261e65addb70d931d514a73530c7 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 16 Aug 2023 11:52:40 +0100 Subject: Fix comparison of two `nil` unions against each other --- src/llvm_backend.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src/llvm_backend.cpp') diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 938c9b2ac..f8a743102 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -231,7 +231,7 @@ gb_internal lbValue lb_equal_proc_for_type(lbModule *m, Type *type) { ok = lb_emit_conv(p, ok, t_bool); LLVMBuildRet(p->builder, ok.value); } else { - lbBlock *block_false = lb_create_block(p, "bfalse"); + lbBlock *block_false = lb_create_block(p, "bfalse"); lbBlock *block_switch = lb_create_block(p, "bswitch"); lbValue left_tag = lb_emit_load(p, lb_emit_union_tag_ptr(p, lhs)); @@ -241,8 +241,23 @@ gb_internal lbValue lb_equal_proc_for_type(lbModule *m, Type *type) { lb_emit_if(p, tag_eq, block_switch, block_false); lb_start_block(p, block_switch); - LLVMValueRef v_switch = LLVMBuildSwitch(p->builder, left_tag.value, block_false->block, cast(unsigned)type->Union.variants.count); + unsigned variant_count = cast(unsigned)type->Union.variants.count; + if (type->Union.kind != UnionType_no_nil) { + variant_count += 1; + } + LLVMValueRef v_switch = LLVMBuildSwitch(p->builder, left_tag.value, block_false->block, variant_count); + + if (type->Union.kind != UnionType_no_nil) { + lbBlock *case_block = lb_create_block(p, "bcase"); + lb_start_block(p, case_block); + + lbValue case_tag = lb_const_int(p->module, union_tag_type(type), 0); + + LLVMBuildRet(p->builder, LLVMConstInt(lb_type(m, t_bool), 1, false)); + + LLVMAddCase(v_switch, case_tag.value, case_block->block); + } for (Type *v : type->Union.variants) { lbBlock *case_block = lb_create_block(p, "bcase"); -- cgit v1.2.3