performance attempt

erik-krogh · erik-krogh · commit 0aa3378edc8f · 2021-09-19T22:04:37.000+02:00
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -105,9 +105,7 @@ module API {
      * For example, modules have an `exports` member representing their exports, and objects have
      * their properties as members.
      */
-    bindingset[m]
-    bindingset[result]
-    Node getMember(string m) { result = getASuccessor(Label::member(m)) }
+    Node getMember(string m) { Impl::memberEdge(this, m, result) }
 
     /**
      * Gets a node representing a member of this API component where the name of the member is
@@ -119,10 +117,7 @@ module API {
      * Gets a node representing a member of this API component where the name of the member may
      * or may not be known statically.
      */
-    Node getAMember() {
-      result = getASuccessor(Label::member(_)) or
-      result = getUnknownMember()
-    }
+    Node getAMember() { Impl::anyMemberEdge(this, result) }
 
     /**
      * Gets a node representing an instance of this API component, that is, an object whose
@@ -812,6 +807,14 @@ module API {
       result = awaited(call, DataFlow::TypeTracker::end())
     }
 
+    cached
+    predicate memberEdge(TApiNode pred, string member, TApiNode succ) {
+      edge(pred, Label::member(member), succ)
+    }
+
+    cached
+    predicate anyMemberEdge(TApiNode pred, TApiNode succ) { memberEdge(pred, _, succ) }
+
     /**
      * Holds if there is an edge from `pred` to `succ` in the API graph that is labeled with `lbl`.
      */
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll b/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
@@ -1151,18 +1151,18 @@ private predicate reachableFromInput(
 }
 
 /**
- * Holds if there is a level step from `pred` to `succ` under `cfg` that can be appended
- * to a path represented by `oldSummary` yielding a path represented by `newSummary`.
+ * Holds if there is a level step from `mid` to `nd` under `cfg` that can be appended
+ * to a path represented by `oldSummary` yielding a path represented by `summary`.
  */
-pragma[noinline]
+pragma[noopt]
 private predicate appendStep(
-  DataFlow::Node pred, DataFlow::Configuration cfg, PathSummary oldSummary, DataFlow::Node succ,
-  PathSummary newSummary
+  DataFlow::Node mid, DataFlow::Configuration cfg, PathSummary oldSummary, DataFlow::Node nd,
+  PathSummary summary
 ) {
   exists(PathSummary stepSummary |
-    flowStep(pred, cfg, succ, stepSummary) and
+    flowStep(mid, cfg, nd, stepSummary) and
     stepSummary.isLevel() and
-    newSummary = oldSummary.append(stepSummary)
+    summary = oldSummary.append(stepSummary)
   )
 }
 
@@ -1301,6 +1301,13 @@ private predicate reachesReturn(
   summary = PathSummary::level() and
   callInputStep(f, _, _, _, _) // check that a relevant result can exist.
   or
+  reachesReturnRec(f, read, cfg, summary)
+}
+
+pragma[noopt]
+private predicate reachesReturnRec(
+  Function f, DataFlow::Node read, DataFlow::Configuration cfg, PathSummary summary
+) {
   exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
     flowStep(read, cfg, mid, oldSummary) and
     reachesReturn(f, mid, cfg, newSummary) and
@@ -1591,6 +1598,7 @@ private predicate flowIntoHigherOrderCall(
  * Holds if there is a flow step from `pred` to `succ` described by `summary`
  * under configuration `cfg`.
  */
+pragma[noinline]
 private predicate flowStep(
   DataFlow::Node pred, DataFlow::Configuration cfg, DataFlow::Node succ, PathSummary summary
 ) {
