Fix comparison of nullable value types

Fixes bug 678791

1 files changed, 6 insertions, 6 deletions

diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index bdd9e5eb2..98b2e5eb6 100644
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -422,12 +422,12 @@ public class Vala.BinaryExpression : Expression {
 			right.target_type.value_owned = false;
 
 			if (left.value_type.nullable != right.value_type.nullable) {
-				// if only one operand is nullable, make sure the other operand is promoted to nullable as well
-				if (!left.value_type.nullable) {
-					left.target_type.nullable = true;
-				} else if (!right.value_type.nullable) {
-					right.target_type.nullable = true;
-				}
+				// if only one operand is nullable, make sure the other
+				// operand is promoted to nullable as well,
+				// reassign both, as get_arithmetic_result_type doesn't
+				// take nullability into account
+				left.target_type.nullable = true;
+				right.target_type.nullable = true;
 			}
 
 			value_type = context.analyzer.bool_type;