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 b2a740c13a3433699e95832646519110eadf705f..a80d7a27a6e46e40bbe74d0457c799027efad2d9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -201,6 +201,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 (file)
index 0000000..7ba2130
--- /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 (file)
index 0000000..2be02e9
--- /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 bfabcf5aa6ce75f8c026a7807bef86deb831b317..f9b66e377292585d853084636680fbc23b964203 100644 (file)
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -511,7 +511,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 ();
+                       }
                        break;
                case BinaryOperator.AND:
                case BinaryOperator.OR: