From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 13 Apr 2019 18:52:35 +0000 (+0200)
Subject: WIP binary fix
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b102f08f46cc01a62e520f81d979ba45ff2705a;p=thirdparty%2Fvala.git

WIP binary fix
---

diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 2dda5017f..af15596f3 100644
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -441,16 +441,18 @@ public class Vala.BinaryExpression : Expression {
 	}
 
 	public override void get_defined_variables (Collection<Variable> collection) {
-		//FIXME Handled special in FlowAnalyzer
-		if (operator != BinaryOperator.AND && operator != BinaryOperator.OR) {
+		if (operator == BinaryOperator.OR) {
+			left.get_defined_variables (collection);
+		} else {
 			left.get_defined_variables (collection);
 			right.get_defined_variables (collection);
 		}
 	}
 
 	public override void get_used_variables (Collection<Variable> collection) {
-		//FIXME Handled special in FlowAnalyzer
-		if (operator != BinaryOperator.AND && operator != BinaryOperator.OR) {
+		if (operator == BinaryOperator.OR) {
+			left.get_used_variables (collection);
+		} else {
 			left.get_used_variables (collection);
 			right.get_used_variables (collection);
 		}