JS: minor fixup: only traverse LogNotExprs

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 15123da0b7f7 · 2018-11-13T08:19:38.000+01:00
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
@@ -73,16 +73,18 @@ predicate isConstantBooleanReturnValue(Expr e) {
   isConstantBooleanReturnValue(e.(LogNotExpr).getOperand())
 }
 
+private Expr maybeStripLogNot(Expr e) {
+  result = maybeStripLogNot(e.(LogNotExpr).getOperand()) or
+  result = e
+}
+
 /**
  * Holds if `e` is a defensive expression with a fixed outcome.
  */
 predicate isConstantDefensive(Expr e) {
-  exists(Expr defensive |
-    defensive = e or
-    // traverse negations
-    defensive.(LogNotExpr).getOperand+() = e
-    |
-    exists(defensive.flow().(DefensiveExpressionTest).getTheTestResult())
+  exists(DefensiveExpressionTest defensive |
+    maybeStripLogNot(defensive.asExpr()) = e and
+    exists(defensive.getTheTestResult())
   )
 }
 
