cached stages iteration 4

erik-krogh · erik-krogh · commit a8f9a91e3872 · 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
@@ -18,7 +18,11 @@ abstract class AstNode extends AstNode_ {
    * NOTE: For some statements and other purely syntactic elements,
    * there may not be a `ControlFlowNode`
    */
-  ControlFlowNode getAFlowNode() { py_flow_bb_node(result, this, _, _) }
+  cached
+  ControlFlowNode getAFlowNode() {
+    Stages::SSA::ref() and
+    py_flow_bb_node(result, this, _, _)
+  }
 
   /** Gets the location for this AST node */
   cached
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
@@ -194,7 +194,9 @@ class ControlFlowNode extends @py_flow_node {
   BasicBlock getBasicBlock() { result.contains(this) }
 
   /** Gets the scope containing this flow node */
+  cached
   Scope getScope() {
+    Stages::SSA::ref() and
     if this.getNode() instanceof Scope
     then
       /* Entry or exit node */
diff --git a/python/ql/lib/semmle/python/internal/CachedStages.qll b/python/ql/lib/semmle/python/internal/CachedStages.qll
@@ -20,8 +20,6 @@
  * on some but not all the cached predicates in the combined stage.
  */
 
-import python
-
 /**
  * Contains a `cached module` for each stage.
  * Each `cached module` ensures that predicates that are supposed to be in the same stage, are in the same stage.
@@ -79,11 +77,15 @@ module Stages {
       or
       any(AstExtended::AstNode n).contains(_)
       or
+      exists(any(AstExtended::AstNode n).getAFlowNode())
+      or
       exists(any(PyFlow::BasicBlock b).getImmediateDominator())
       or
       any(PyFlow::BasicBlock b).strictlyDominates(_)
       or
       any(PyFlow::BasicBlock b).dominates(_)
+      or
+      exists(any(PyFlow::ControlFlowNode b).getScope())
     }
   }
 
@@ -136,6 +138,7 @@ module Stages {
     private import semmle.python.objects.TObject as TObject
     private import semmle.python.Flow as Flow
     private import semmle.python.objects.ObjectInternal as ObjectInternal
+    private import semmle.python.objects.ObjectAPI as ObjectAPI
 
     /**
      * DONT USE!
@@ -162,6 +165,8 @@ module Stages {
       exists(any(Flow::ControlFlowNode c).toString())
       or
       exists(any(ObjectInternal::ObjectInternal o).toString())
+      or
+      exists(any(ObjectAPI::Value::named(_)))
     }
   }
 
diff --git a/python/ql/lib/semmle/python/objects/ObjectAPI.qll b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
@@ -10,6 +10,7 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
+private import semmle.python.internal.CachedStages
 
 /*
  * Use the term `ObjectSource` to refer to DB entity. Either a CFG node
@@ -263,7 +264,9 @@ module Value {
    * object of that name.
    * For example `Value::named("len")` is the `Value` representing the `len` built-in function.
    */
+  cached
   Value named(string name) {
+    Stages::DataFlow::ref() and
     exists(string modname, string attrname | name = modname + "." + attrname |
       result = Module::named(modname).attr(attrname)
     )
