Merge pull request github#5386 from erik-krogh/cachePrepend

Approved by asgerf

Author: codeql-ci

javascript/ql/src/semmle/javascript/dataflow/TypeTracking.qll

@@ -9,6 +9,7 @@
 private import javascript
 private import internal.FlowSteps
 private import internal.StepSummary
+private import semmle.javascript.internal.CachedStages
 
 private newtype TTypeTracker = MkTypeTracker(Boolean hasCall, OptionalPropertyName prop)
 
@@ -51,7 +52,9 @@ class TypeTracker extends TTypeTracker {
   /** Gets the summary resulting from appending `step` to this type-tracking summary. */
   cached
   TypeTracker append(StepSummary step) {
-    step = LevelStep() and result = this
+    Stages::TypeTracking::ref() and
+    step = LevelStep() and
+    result = this
     or
     exists(string toProp | step = LoadStoreStep(prop, toProp) |
       result = MkTypeTracker(hasCall, toProp)
@@ -214,8 +217,11 @@ class TypeBackTracker extends TTypeBackTracker {
   TypeBackTracker() { this = MkTypeBackTracker(hasReturn, prop) }
 
   /** Gets the summary resulting from prepending `step` to this type-tracking summary. */
+  cached
   TypeBackTracker prepend(StepSummary step) {
-    step = LevelStep() and result = this
+    Stages::TypeTracking::ref() and
+    step = LevelStep() and
+    result = this
     or
     exists(string fromProp | step = LoadStoreStep(fromProp, prop) |
       result = MkTypeBackTracker(hasReturn, fromProp)

javascript/ql/src/semmle/javascript/internal/CachedStages.qll

@@ -181,6 +181,10 @@ module Stages {
       PreCallGraphStep::loadStep(_, _, _)
       or
       basicLoadStep(_, _, _)
+      or
+      exists(any(DataFlow::TypeTracker t).append(_))
+      or
+      exists(any(DataFlow::TypeBackTracker t).prepend(_))
     }
   }