Apply suggestions from code review

yoff · RasmusWL · web-flow · commit 2a4e28db16b4 · 2020-09-14T15:28:01.000+02:00
Will make the same renames in the changed code also..

Co-authored-by: Rasmus Wriedt Larsen &lt;rasmuswriedtlarsen@gmail.com&gt;
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
@@ -172,8 +172,8 @@ class GuardNode extends ControlFlowNode {
  * It is important that all extending classes in scope are disjoint.
  */
 class BarrierGuard extends GuardNode {
-  /** Holds if this guard validates `e` upon evaluating to `v`. */
-  abstract predicate checks(ControlFlowNode node, boolean testIsTrue);
+  /** Holds if this guard validates `node` upon evaluating to `branch`. */
+  abstract predicate checks(ControlFlowNode node, boolean branch);
 
   /** Gets a node guarded by this guard. */
   final ExprNode getAGuardedNode() {
diff --git a/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql b/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql
@@ -3,9 +3,9 @@ import experimental.dataflow.tainttracking.TestTaintLib
 class IsSafeCheck extends DataFlow::BarrierGuard {
   IsSafeCheck() { this.(CallNode).getNode().getFunc().(Name).getId() = "emulated_is_safe" }
 
-  override predicate checks(ControlFlowNode node, boolean testIsTrue) {
+  override predicate checks(ControlFlowNode node, boolean branch) {
     node = this.(CallNode).getAnArg() and
-    testIsTrue = true
+    branch = true
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ import experimental.dataflow.tainttracking.TestTaintLib`
`3`	`3`	`class IsSafeCheck extends DataFlow::BarrierGuard {`
`4`	`4`	`IsSafeCheck() { this.(CallNode).getNode().getFunc().(Name).getId() = "emulated_is_safe" }`
`5`	`5`
`6`		`- override predicate checks(ControlFlowNode node, boolean testIsTrue) {`
	`6`	`+ override predicate checks(ControlFlowNode node, boolean branch) {`
`7`	`7`	`node = this.(CallNode).getAnArg() and`
`8`		`- testIsTrue = true`
	`8`	`+ branch = true`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`