Python: add missing * (and a rename)

yoff · yoff · commit 4c028523586d · 2020-09-14T16:56:46.000+02:00
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
@@ -178,9 +178,9 @@ class BarrierGuard extends GuardNode {
   /** Gets a node guarded by this guard. */
   final ExprNode getAGuardedNode() {
     exists(EssaDefinition def, ControlFlowNode node, boolean branch |
-      AdjacentUses::aUse(def, node) and
+      AdjacentUses::useOfDef(def, node) and
       this.checks(node, branch) and
-      AdjacentUses::aUse(def, result.asCfgNode()) and
+      AdjacentUses::useOfDef(def, result.asCfgNode()) and
       this.controlsBlock(result.asCfgNode().getBasicBlock(), branch)
     )
   }
diff --git a/python/ql/src/semmle/python/essa/SsaCompute.qll b/python/ql/src/semmle/python/essa/SsaCompute.qll
@@ -506,12 +506,10 @@ private module SsaComputeImpl {
      * Holds if the value defined at `def` can reach `use`, possibly through phi nodes.
      */
     cached
-    predicate aUse(EssaDefinition def, ControlFlowNode use) {
-      firstUse(def, use)
-      or
+    predicate useOfDef(EssaDefinition def, ControlFlowNode use) {
       exists(ControlFlowNode firstUse |
         firstUse(def, firstUse) and
-        adjacentUseUse(firstUse, use)
+        adjacentUseUse*(firstUse, use)
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,9 @@ class BarrierGuard extends GuardNode {`
`178`	`178`	`/** Gets a node guarded by this guard. */`
`179`	`179`	`final ExprNode getAGuardedNode() {`
`180`	`180`	`exists(EssaDefinition def, ControlFlowNode node, boolean branch \|`
`181`		`- AdjacentUses::aUse(def, node) and`
	`181`	`+ AdjacentUses::useOfDef(def, node) and`
`182`	`182`	`this.checks(node, branch) and`
`183`		`- AdjacentUses::aUse(def, result.asCfgNode()) and`
	`183`	`+ AdjacentUses::useOfDef(def, result.asCfgNode()) and`
`184`	`184`	`this.controlsBlock(result.asCfgNode().getBasicBlock(), branch)`
`185`	`185`	`)`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -506,12 +506,10 @@ private module SsaComputeImpl {`
`506`	`506`	* Holds if the value defined at `def` can reach `use`, possibly through phi nodes.
`507`	`507`	`*/`
`508`	`508`	`cached`
`509`		`- predicate aUse(EssaDefinition def, ControlFlowNode use) {`
`510`		`- firstUse(def, use)`
`511`		`- or`
	`509`	`+ predicate useOfDef(EssaDefinition def, ControlFlowNode use) {`
`512`	`510`	`exists(ControlFlowNode firstUse \|`
`513`	`511`	`firstUse(def, firstUse) and`
`514`		`- adjacentUseUse(firstUse, use)`
	`512`	`+ adjacentUseUse*(firstUse, use)`
`515`	`513`	`)`
`516`	`514`	`}`
`517`	`515`	`}`