From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 24 Oct 2019 12:15:56 +0000 (+0200)
Subject: vala: Don't falsely resolve binary-expression to bool
X-Git-Tag: 0.44.10~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=682209a13b738f3cc6567c130db0b89ddfaddb9e;p=thirdparty%2Fvala.git

vala: Don't falsely resolve binary-expression to bool

Fixes https://gitlab.gnome.org/GNOME/vala/issues/869
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 08e46cd05..028064545 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -198,6 +198,8 @@ TESTS = \
 	control-semantic/argument-owned-ref.test \
 	control-semantic/argument-value-out.test \
 	control-semantic/argument-value-ref.test \
+	control-semantic/condition-not-boolean.test \
+	control-semantic/expression-not-boolean.test \
 	control-semantic/literal-immutable.test \
 	control-semantic/member-incompatible-type.test \
 	control-semantic/member-invalid.test \
diff --git a/tests/control-semantic/condition-not-boolean.test b/tests/control-semantic/condition-not-boolean.test
new file mode 100644
index 000000000..7ba2130e9
--- /dev/null
+++ b/tests/control-semantic/condition-not-boolean.test
@@ -0,0 +1,7 @@
+Invalid Code
+
+void main () {
+	if (true != false & 0) {
+		assert_not_reached ();
+	}
+}
diff --git a/tests/control-semantic/expression-not-boolean.test b/tests/control-semantic/expression-not-boolean.test
new file mode 100644
index 000000000..2be02e98d
--- /dev/null
+++ b/tests/control-semantic/expression-not-boolean.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+	bool foo = true != false & 0;
+}
diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 0578ba93d..5e9b7be42 100644
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -498,7 +498,13 @@ public class Vala.BinaryExpression : Expression {
 			left.target_type.nullable = false;
 			right.target_type.nullable = false;
 
-			value_type = left.target_type.copy ();
+			// Don't falsely resolve to bool
+			if (left.value_type.compatible (context.analyzer.bool_type)
+			    && !right.value_type.compatible (context.analyzer.bool_type)) {
+				value_type = right.target_type.copy ();
+			} else {
+				value_type = left.target_type.copy ();
+			}
 		} else if (operator == BinaryOperator.AND
 			   || operator == BinaryOperator.OR) {
 			if (!left.value_type.compatible (context.analyzer.bool_type) || !right.value_type.compatible (context.analyzer.bool_type)) {