Swift: Add the capture flow step as part of the normal data flow relation

d10c · MathiasVP · commit 8115774a7a19 · 2023-10-24T13:56:31.000+01:00
TODO: see if we need to exclude duplicate SSA steps
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -291,6 +291,9 @@ private module Cached {
     // flow through a flow summary (extension of `SummaryModelCsv`)
     FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
       nodeTo.(FlowSummaryNode).getSummaryNode(), true)
+    or
+    // flow step according to the closure capture library
+    captureValueStep(nodeFrom, nodeTo)
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,9 @@ private module Cached {`
`291`	`291`	// flow through a flow summary (extension of `SummaryModelCsv`)
`292`	`292`	`FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),`
`293`	`293`	`nodeTo.(FlowSummaryNode).getSummaryNode(), true)`
	`294`	`+ or`
	`295`	`+ // flow step according to the closure capture library`
	`296`	`+ captureValueStep(nodeFrom, nodeTo)`
`294`	`297`	`}`
`295`	`298`
`296`	`299`	`/**`