swift

Author: hvitved

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll

@@ -305,8 +305,7 @@ private module Cached {
     model = ""
     or
     // flow through a flow summary (extension of `SummaryModelCsv`)
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
   }
 
   /**
@@ -1014,8 +1013,7 @@ predicate captureValueStep(Node node1, Node node2) {
 
 predicate jumpStep(Node pred, Node succ) {
   // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),
-    succ.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred, succ)
 }
 
 predicate storeStep(Node node1, ContentSet c, Node node2) {

swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll

@@ -129,15 +129,20 @@ private module Input2 implements Impl::Private::InputSig2 {
     DataFlowCallable getEnclosingCallable() { none() }
   }
 
-  bindingset[source, s]
   SourceSinkReportingElement getSourceEntryElement(
-    Impl::Public::SourceElement source, Impl::Private::SummaryComponentStack s
+    Impl::Public::SourceElement source, Impl::Private::SummaryComponent sc
   ) {
     none()
   }
 
-  bindingset[e, s]
-  Node getSourceExitNode(SourceSinkReportingElement e, Impl::Private::SummaryComponentStack s) {
+  SourceSinkReportingElement getNextElement(
+    SourceSinkReportingElement prev, Impl::Private::SummaryComponent sc
+  ) {
+    none()
+  }
+
+  bindingset[e, sc]
+  Node getSourceExitNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
     none()
   }
 

swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll

@@ -76,8 +76,7 @@ private module Cached {
     model = ""
     or
     // flow through a flow summary (extension of `SummaryModelCsv`)
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
     or
     any(AdditionalTaintStep a).step(nodeFrom, nodeTo) and model = "AdditionalTaintStep"
   }