cached stages iteration 5

erik-krogh · erik-krogh · commit c9e3a62953ac · 2022-03-30T22:54:00.000+02:00
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
@@ -619,7 +619,9 @@ class UnaryExprNode extends ControlFlowNode {
  * and nodes implicitly assigned in class and function definitions and imports.
  */
 class DefinitionNode extends ControlFlowNode {
+  cached
   DefinitionNode() {
+    Stages::SSA::ref() and
     exists(Assign a | a.getATarget().getAFlowNode() = this)
     or
     exists(AnnAssign a | a.getTarget().getAFlowNode() = this and exists(a.getValue()))
@@ -678,6 +680,7 @@ abstract class SequenceNode extends ControlFlowNode {
   ControlFlowNode getAnElement() { result = this.getElement(_) }
 
   /** Gets the control flow node for the nth element of this sequence */
+  cached
   abstract ControlFlowNode getElement(int n);
 }
 
@@ -686,6 +689,7 @@ class TupleNode extends SequenceNode {
   TupleNode() { toAst(this) instanceof Tuple }
 
   override ControlFlowNode getElement(int n) {
+    Stages::SSA::ref() and
     exists(Tuple t | this.getNode() = t and result.getNode() = t.getElt(n)) and
     (
       result.getBasicBlock().dominates(this.getBasicBlock())
diff --git a/python/ql/lib/semmle/python/internal/CachedStages.qll b/python/ql/lib/semmle/python/internal/CachedStages.qll
@@ -86,6 +86,10 @@ module Stages {
       any(PyFlow::BasicBlock b).dominates(_)
       or
       exists(any(PyFlow::ControlFlowNode b).getScope())
+      or
+      exists(PyFlow::DefinitionNode b)
+      or
+      exists(any(PyFlow::SequenceNode n).getElement(_))
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,10 @@ module Stages {`
`86`	`86`	`any(PyFlow::BasicBlock b).dominates(_)`
`87`	`87`	`or`
`88`	`88`	`exists(any(PyFlow::ControlFlowNode b).getScope())`
	`89`	`+ or`
	`90`	`+ exists(PyFlow::DefinitionNode b)`
	`91`	`+ or`
	`92`	`+ exists(any(PyFlow::SequenceNode n).getElement(_))`
`89`	`93`	`}`
`90`	`94`	`}`
`91`	`95`