From 3fc60930e6c18924a7d38b81fd50ee4379f94b62 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Thu, 9 May 2019 22:46:50 +0100
Subject: [PATCH] Fix constant representability rules

---
 src/check_expr.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index a7e4a21e2..8fdad0774 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -526,12 +526,6 @@ i64 check_distance_between_types(CheckerContext *c, Operand *operand, Type *type
 	}
 
 	if (is_type_bit_field_value(operand->type) && is_type_integer(type)) {
-		Type *bfv = base_type(operand->type);
-		i32 bits = bfv->BitFieldValue.bits;
-		i32 size = next_pow2((bits+7)/8);
-		i32 dst_size = cast(i32)type_size_of(type);
-		i32 diff = gb_abs(dst_size - size);
-		// TODO(bill): figure out a decent rule here
 		return 1;
 	}
 
@@ -1306,6 +1300,9 @@ bool check_representable_as_constant(CheckerContext *c, ExactValue in_value, Typ
 	} else if (is_type_string(type)) {
 		return in_value.kind == ExactValue_String;
 	} else if (is_type_integer(type) || is_type_rune(type)) {
+		if (in_value.kind == ExactValue_Bool) {
+			return false;
+		}
 		ExactValue v = exact_value_to_integer(in_value);
 		if (v.kind != ExactValue_Integer) {
 			return false;