get around identical files by adding the ref() call somewhere else

erik-krogh · erik-krogh · commit 6eca4ba2d3fc · 2022-03-30T22:54:00.000+02:00
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
@@ -1,7 +1,6 @@
 /** Step Summaries and Type Tracking */
 
 private import TypeTrackerSpecific
-private import semmle.python.internal.CachedStages
 
 /**
  * A string that may appear as the name of a piece of content. This will usually include things like:
@@ -41,7 +40,6 @@ private module Cached {
   /** Gets the summary resulting from appending `step` to type-tracking summary `tt`. */
   cached
   TypeTracker append(TypeTracker tt, StepSummary step) {
-    Stages::TypeTracking::ref() and
     exists(Boolean hasCall, OptionalContentName content | tt = MkTypeTracker(hasCall, content) |
       step = LevelStep() and result = tt
       or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
@@ -5,6 +5,7 @@
 private import python
 private import semmle.python.dataflow.new.internal.DataFlowPublic as DataFlowPublic
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
+import semmle.python.internal.CachedStages
 
 class Node = DataFlowPublic::Node;
 
@@ -21,7 +22,10 @@ predicate levelStep(Node pred, Node succ) { none() }
  * Gets the name of a possible piece of content. For Python, this is currently only attribute names,
  * using the name of the attribute for the corresponding content.
  */
-string getPossibleContentName() { result = any(DataFlowPublic::AttrRef a).getAttributeName() }
+string getPossibleContentName() {
+  Stages::TypeTracking::ref() and // the TypeTracking::append() etc. predicates that we want to cache depend on this predicate, so we can place the `ref()` call here to get around identical files.
+  result = any(DataFlowPublic::AttrRef a).getAttributeName()
+}
 
 /**
  * Gets a callable for the call where `nodeFrom` is used as the `i`'th argument.
