Python: testIsTrue -> branch

yoff · yoff · commit ecc5a4a1f677 · 2020-09-14T15:32:03.000+02:00
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
@@ -177,11 +177,11 @@ class BarrierGuard extends GuardNode {
 
   /** Gets a node guarded by this guard. */
   final ExprNode getAGuardedNode() {
-    exists(EssaDefinition def, ControlFlowNode node, boolean testIsTrue |
+    exists(EssaDefinition def, ControlFlowNode node, boolean branch |
       AdjacentUses::aUse(def, node) and
-      this.checks(node, testIsTrue) and
+      this.checks(node, branch) and
       AdjacentUses::aUse(def, result.asCfgNode()) and
-      this.controlsBlock(result.asCfgNode().getBasicBlock(), testIsTrue)
+      this.controlsBlock(result.asCfgNode().getBasicBlock(), branch)
     )
   }
 }
diff --git a/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql b/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql
@@ -34,11 +34,11 @@ query predicate isSanitizerGuard(TestTaintTrackingConfiguration conf, DataFlow::
 
 query predicate sanitizerGuardControls(
   TestTaintTrackingConfiguration conf, DataFlow::BarrierGuard guard, ControlFlowNode node,
-  boolean testIsTrue
+  boolean branch
 ) {
   exists(guard.getLocation().getFile().getRelativePath()) and
   conf.isSanitizerGuard(guard) and
-  guard.controlsBlock(node.getBasicBlock(), testIsTrue)
+  guard.controlsBlock(node.getBasicBlock(), branch)
 }
 
 query predicate sanitizerGuardedNode(

Original file line number	Diff line number	Diff line change
`@@ -177,11 +177,11 @@ class BarrierGuard extends GuardNode {`
`177`	`177`
`178`	`178`	`/** Gets a node guarded by this guard. */`
`179`	`179`	`final ExprNode getAGuardedNode() {`
`180`		`- exists(EssaDefinition def, ControlFlowNode node, boolean testIsTrue \|`
	`180`	`+ exists(EssaDefinition def, ControlFlowNode node, boolean branch \|`
`181`	`181`	`AdjacentUses::aUse(def, node) and`
`182`		`- this.checks(node, testIsTrue) and`
	`182`	`+ this.checks(node, branch) and`
`183`	`183`	`AdjacentUses::aUse(def, result.asCfgNode()) and`
`184`		`- this.controlsBlock(result.asCfgNode().getBasicBlock(), testIsTrue)`
	`184`	`+ this.controlsBlock(result.asCfgNode().getBasicBlock(), branch)`
`185`	`185`	`)`
`186`	`186`	`}`
`187`	`187`	`}`