Python: avoid creating big predicate

yoff · yoff · commit 033529e85e7f · 2020-09-14T15:24:46.000+02:00
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
@@ -157,8 +157,8 @@ class GuardNode extends ControlFlowNode {
 
   GuardNode() { this = conditionBlock.getLastNode() }
 
-  predicate controlsNode(ControlFlowNode node, boolean testIsTrue) {
-    conditionBlock.controls(node.getBasicBlock(), testIsTrue)
+  predicate controlsBlock(BasicBlock b, boolean testIsTrue) {
+    conditionBlock.controls(b, testIsTrue)
   }
 }
 
@@ -181,7 +181,7 @@ class BarrierGuard extends GuardNode {
       AdjacentUses::aUse(def, node) and
       this.checks(node, testIsTrue) and
       AdjacentUses::aUse(def, result.asCfgNode()) and
-      this.controlsNode(result.asCfgNode(), testIsTrue)
+      this.controlsBlock(result.asCfgNode().getBasicBlock(), testIsTrue)
     )
   }
 }
diff --git a/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql b/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql
@@ -38,7 +38,7 @@ query predicate sanitizerGuardControls(
 ) {
   exists(guard.getLocation().getFile().getRelativePath()) and
   conf.isSanitizerGuard(guard) and
-  guard.controlsNode(node, testIsTrue)
+  guard.controlsBlock(node.getBasicBlock(), testIsTrue)
 }
 
 query predicate sanitizerGuardedNode(

Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,8 @@ class GuardNode extends ControlFlowNode {`
`157`	`157`
`158`	`158`	`GuardNode() { this = conditionBlock.getLastNode() }`
`159`	`159`
`160`		`- predicate controlsNode(ControlFlowNode node, boolean testIsTrue) {`
`161`		`- conditionBlock.controls(node.getBasicBlock(), testIsTrue)`
	`160`	`+ predicate controlsBlock(BasicBlock b, boolean testIsTrue) {`
	`161`	`+ conditionBlock.controls(b, testIsTrue)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`@@ -181,7 +181,7 @@ class BarrierGuard extends GuardNode {`
`181`	`181`	`AdjacentUses::aUse(def, node) and`
`182`	`182`	`this.checks(node, testIsTrue) and`
`183`	`183`	`AdjacentUses::aUse(def, result.asCfgNode()) and`
`184`		`- this.controlsNode(result.asCfgNode(), testIsTrue)`
	`184`	`+ this.controlsBlock(result.asCfgNode().getBasicBlock(), testIsTrue)`
`185`	`185`	`)`
`186`	`186`	`}`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ query predicate sanitizerGuardControls(`
`38`	`38`	`) {`
`39`	`39`	`exists(guard.getLocation().getFile().getRelativePath()) and`
`40`	`40`	`conf.isSanitizerGuard(guard) and`
`41`		`- guard.controlsNode(node, testIsTrue)`
	`41`	`+ guard.controlsBlock(node.getBasicBlock(), testIsTrue)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`query predicate sanitizerGuardedNode(`