js

Author: hvitved

javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll

@@ -1214,8 +1214,7 @@ private predicate valuePreservingStep(Node node1, Node node2) {
   or
   node2 = FlowSteps::getThrowTarget(node1)
   or
-  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2.(FlowSummaryNode).getSummaryNode(), true,
-    _) // TODO: preserve 'model'
+  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2, true, _) // TODO: preserve 'model'
 }
 
 predicate knownSourceModel(Node sink, string model) { none() }
@@ -1367,8 +1366,7 @@ predicate jumpStep(Node node1, Node node2) {
   node1.getContainer() != node2.getContainer() and
   not excludedJumpStep(node1, node2)
   or
-  FlowSummaryPrivate::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
-    node2.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryPrivate::Steps::summaryJumpStep(node1, node2)
   or
   DataFlow::AdditionalFlowStep::jumpStep(node1, node2)
 }

javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll

@@ -160,23 +160,26 @@ private module Input2 implements Private::InputSig2 {
     DataFlowCallable getEnclosingCallable() { none() }
   }
 
-  bindingset[source, s]
   SourceSinkReportingElement getSourceEntryElement(
-    SourceElement source, Private::SummaryComponentStack s
+    SourceElement source, Private::SummaryComponent sc
   ) {
     none()
   }
 
-  bindingset[e, s]
-  DataFlow::Node getSourceExitNode(SourceSinkReportingElement e, Private::SummaryComponentStack s) {
+  SourceSinkReportingElement getNextElement(
+    SourceSinkReportingElement prev, Private::SummaryComponent sc
+  ) {
+    none()
+  }
+
+  DataFlow::Node getSourceExitNode(SourceSinkReportingElement e, Private::SummaryComponent sc) {
     none()
   }
 
   SourceSinkReportingElement getSinkExitElement(SinkElement sink, Private::SummaryComponent sc) {
     none()
   }
 
-  bindingset[e, sc]
   DataFlow::Node getSinkEntryNode(SourceSinkReportingElement e, Private::SummaryComponent sc) {
     none()
   }

javascript/ql/lib/semmle/javascript/dataflow/internal/TaintTrackingPrivate.qll

@@ -12,8 +12,7 @@ cached
 predicate defaultAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
   TaintTracking::AdditionalTaintStep::step(node1, node2)
   or
-  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2.(FlowSummaryNode).getSummaryNode(),
-    false, _) // TODO: preserve 'model' parameter
+  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2, false, _) // TODO: preserve 'model' parameter
   or
   // Convert steps out of array elements to plain taint steps
   FlowSummaryPrivate::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(),