implement review suggestions

Author: redsun82

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll

@@ -416,9 +416,10 @@ class ThisArgumentOperand extends ArgumentOperand {
   // in most cases the def location makes more sense, but in some corner cases it
   // does not have a location: in those cases we fall back to the use location
   override Language::Location getLocation() {
-    if exists(Language::Location loc | loc = this.getAnyDef().getLocation())
-    then result = this.getAnyDef().getLocation()
-    else result = this.getUse().getLocation()
+    result = this.getAnyDef().getLocation()
+    or
+    not exists(this.getAnyDef().getLocation()) and
+    result = this.getUse().getLocation()
   }
 }
 

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll

@@ -416,9 +416,10 @@ class ThisArgumentOperand extends ArgumentOperand {
   // in most cases the def location makes more sense, but in some corner cases it
   // does not have a location: in those cases we fall back to the use location
   override Language::Location getLocation() {
-    if exists(Language::Location loc | loc = this.getAnyDef().getLocation())
-    then result = this.getAnyDef().getLocation()
-    else result = this.getUse().getLocation()
+    result = this.getAnyDef().getLocation()
+    or
+    not exists(this.getAnyDef().getLocation()) and
+    result = this.getUse().getLocation()
   }
 }
 

cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll

@@ -416,9 +416,10 @@ class ThisArgumentOperand extends ArgumentOperand {
   // in most cases the def location makes more sense, but in some corner cases it
   // does not have a location: in those cases we fall back to the use location
   override Language::Location getLocation() {
-    if exists(Language::Location loc | loc = this.getAnyDef().getLocation())
-    then result = this.getAnyDef().getLocation()
-    else result = this.getUse().getLocation()
+    result = this.getAnyDef().getLocation()
+    or
+    not exists(this.getAnyDef().getLocation()) and
+    result = this.getUse().getLocation()
   }
 }
 

csharp/ql/src/experimental/ir/implementation/raw/Operand.qll

@@ -416,9 +416,10 @@ class ThisArgumentOperand extends ArgumentOperand {
   // in most cases the def location makes more sense, but in some corner cases it
   // does not have a location: in those cases we fall back to the use location
   override Language::Location getLocation() {
-    if exists(Language::Location loc | loc = this.getAnyDef().getLocation())
-    then result = this.getAnyDef().getLocation()
-    else result = this.getUse().getLocation()
+    result = this.getAnyDef().getLocation()
+    or
+    not exists(this.getAnyDef().getLocation()) and
+    result = this.getUse().getLocation()
   }
 }
 

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll

@@ -416,9 +416,10 @@ class ThisArgumentOperand extends ArgumentOperand {
   // in most cases the def location makes more sense, but in some corner cases it
   // does not have a location: in those cases we fall back to the use location
   override Language::Location getLocation() {
-    if exists(Language::Location loc | loc = this.getAnyDef().getLocation())
-    then result = this.getAnyDef().getLocation()
-    else result = this.getUse().getLocation()
+    result = this.getAnyDef().getLocation()
+    or
+    not exists(this.getAnyDef().getLocation()) and
+    result = this.getUse().getLocation()
   }
 }