cached stages iteration 3.5

erik-krogh · erik-krogh · commit f68357a06306 · 2022-03-30T22:54:00.000+02:00
diff --git a/python/ql/lib/semmle/python/AstExtended.qll b/python/ql/lib/semmle/python/AstExtended.qll
@@ -47,10 +47,18 @@ abstract class AstNode extends AstNode_ {
    * Expr.getASubExpression(), Stmt.getASubStatement(), Stmt.getASubExpression() or
    * Scope.getAStmt() applied to the parent.
    */
-  AstNode getParentNode() { result.getAChildNode() = this }
+  cached
+  AstNode getParentNode() {
+    Stages::SSA::ref() and
+    result.getAChildNode() = this
+  }
 
   /** Whether this contains `inner` syntactically */
-  predicate contains(AstNode inner) { this.getAChildNode+() = inner }
+  cached
+  predicate contains(AstNode inner) {
+    Stages::SSA::ref() and
+    this.getAChildNode+() = inner
+  }
 
   pragma[noinline]
   private predicate containsInScope(AstNode inner, Scope scope) {
@@ -114,6 +122,7 @@ class Comprehension extends Comprehension_, AstNode {
     result = Comprehension_.super.getLocation()
   }
 
+  pragma[nomagic]
   override AstNode getAChildNode() {
     Stages::SSA::ref() and
     result = this.getASubExpression()
diff --git a/python/ql/lib/semmle/python/internal/CachedStages.qll b/python/ql/lib/semmle/python/internal/CachedStages.qll
@@ -75,6 +75,10 @@ module Stages {
       or
       exists(any(AstExtended::AstNode n).getAChildNode())
       or
+      exists(any(AstExtended::AstNode n).getParentNode())
+      or
+      any(AstExtended::AstNode n).contains(_)
+      or
       exists(any(PyFlow::BasicBlock b).getImmediateDominator())
       or
       any(PyFlow::BasicBlock b).strictlyDominates(_)
