From 876af6fb029c9f32d674e96b7a5ef263ba74bba5 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Wed, 17 Jan 2018 19:27:13 +0000
Subject: Modify boolean conversion in IR

---
 src/ir.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/ir.cpp')

diff --git a/src/ir.cpp b/src/ir.cpp
index c151a52cf..8853a47e1 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -3023,8 +3023,7 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
 	}
 
 	// integer -> integer
-	if ((is_type_integer(src) && is_type_integer(dst)) ||
-	    (is_type_boolean(src) && is_type_boolean(dst))) {
+	if (is_type_integer(src) && is_type_integer(dst)) {
 		GB_ASSERT(src->kind == Type_Basic &&
 		          dst->kind == Type_Basic);
 		i64 sz = type_size_of(proc->module->allocator, default_type(src));
@@ -3048,6 +3047,16 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
 		return ir_emit(proc, ir_instr_conv(proc, kind, value, src_type, t));
 	}
 
+	// boolean -> boolean
+	if (is_type_boolean(src) && is_type_boolean(dst)) {
+		GB_ASSERT(src->kind == Type_Basic &&
+		          dst->kind == Type_Basic);
+		GB_ASSERT(src != t_llvm_bool);
+
+		irValue *b = ir_emit(proc, ir_instr_binary_op(proc, Token_NotEq, value, v_zero, t_llvm_bool));
+		return ir_emit(proc, ir_instr_conv(proc, irConv_zext, b, t_llvm_bool, t));
+	}
+
 
 	// boolean -> integer
 	if (is_type_boolean(src) && is_type_integer(dst)) {
-- 
cgit v1.2.3