Swift: data flow configurations working

Author: Robert Marsh

swift/ql/lib/codeql/swift/dataflow/Ssa.qll

@@ -67,8 +67,8 @@ module Ssa {
       or
       exists(VarDecl var, BasicBlock bb, int blockIndex, PatternBindingDecl pbd |
         this.definesAt(var, bb, blockIndex) and
-        pbd.getAPattern() = bb.getNode(blockIndex).getNode() and
-        value.getNode() = var.getParentInitializer()
+        pbd.getAPattern() = bb.getNode(blockIndex).getNode().asAstNode() and
+        value.getNode().asAstNode() = var.getParentInitializer()
       )
     }
   }

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

@@ -188,7 +188,9 @@ class DataFlowType extends TDataFlowType {
 }
 
 /** Gets the type of `n` used for type pruning. */
-DataFlowType getNodeType(NodeImpl n) { none() }
+DataFlowType getNodeType(NodeImpl n) {
+  any() // return the singleton DataFlowType until we support type pruning for Swift
+}
 
 /** Gets a string representation of a `DataFlowType`. */
 string ppReprType(DataFlowType t) { result = t.toString() }

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

@@ -98,7 +98,7 @@ class PostUpdateNode extends Node instanceof PostUpdateNodeImpl {
 }
 
 /** Gets a node corresponding to expression `e`. */
-ExprNode exprNode(DataFlowExpr e) { none() }
+ExprNode exprNode(DataFlowExpr e) { result.asExpr() = e }
 
 /**
  * Gets the node corresponding to the value of parameter `p` at function entry.

swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected

@@ -0,0 +1,14 @@
+edges
+| test.swift:6:19:6:26 | CallExpr :  | test.swift:7:15:7:15 | DeclRefExpr |
+| test.swift:6:19:6:26 | CallExpr :  | test.swift:9:15:9:15 | DeclRefExpr |
+| test.swift:6:19:6:26 | CallExpr :  | test.swift:10:15:10:15 | DeclRefExpr |
+nodes
+| test.swift:6:19:6:26 | CallExpr :  | semmle.label | CallExpr :  |
+| test.swift:7:15:7:15 | DeclRefExpr | semmle.label | DeclRefExpr |
+| test.swift:9:15:9:15 | DeclRefExpr | semmle.label | DeclRefExpr |
+| test.swift:10:15:10:15 | DeclRefExpr | semmle.label | DeclRefExpr |
+subpaths
+#select
+| test.swift:6:19:6:26 | CallExpr :  | test.swift:7:15:7:15 | DeclRefExpr |
+| test.swift:6:19:6:26 | CallExpr :  | test.swift:9:15:9:15 | DeclRefExpr |
+| test.swift:6:19:6:26 | CallExpr :  | test.swift:10:15:10:15 | DeclRefExpr |

swift/ql/test/library-tests/dataflow/dataflow/DataFlow.ql

@@ -12,17 +12,14 @@ class TestConfiguration extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink) {
     exists(CallExpr sinkCall |
       sinkCall.getStaticTarget().getName() = "sink" and
-      sinkCall.getAnArgument() = sink.asExpr()
+      sinkCall.getAnArgument().getExpr() = sink.asExpr()
     )
   }
 
   override int explorationLimit() { result = 100 }
 }
 
-from DataFlow::PartialPathNode src, DataFlow::PartialPathNode sink, TestConfiguration test
+from DataFlow::PathNode src, DataFlow::PathNode sink, TestConfiguration test
 where
-  //test.isSource(src) and
-  // test.isSink(sink) and
-  //DataFlow::localFlow(src, sink)
-  test.hasPartialFlow(src, sink, _)
+  test.hasFlowPath(src, sink)
 select src, sink

swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected

@@ -1,6 +1,7 @@
 | file://:0:0:0:0 | Phi | test.swift:15:15:15:15 | DeclRefExpr |
 | file://:0:0:0:0 | Phi | test.swift:21:15:21:15 | DeclRefExpr |
 | test.swift:6:9:6:13 | WriteDef | test.swift:7:15:7:15 | DeclRefExpr |
+| test.swift:6:19:6:26 | CallExpr | test.swift:6:9:6:13 | WriteDef |
 | test.swift:7:15:7:15 | DeclRefExpr | test.swift:8:10:8:10 | DeclRefExpr |
 | test.swift:8:5:8:10 | WriteDef | test.swift:10:15:10:15 | DeclRefExpr |
 | test.swift:8:10:8:10 | DeclRefExpr | test.swift:8:5:8:10 | WriteDef |