Swift: Better assigning to tuple values.

Author: geoffw0

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

@@ -86,7 +86,7 @@ private module Cached {
       hasExprNode(n,
         [
           any(Argument arg | modifiable(arg)).getExpr(), any(MemberRefExpr ref).getBase(),
-          any(ApplyExpr apply).getQualifier()
+          any(ApplyExpr apply).getQualifier(), any(TupleElementExpr te).getSubExpr()
         ])
     }
 
@@ -516,7 +516,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
   exists(TupleElementExpr tuple, AssignExpr assign |
     tuple = assign.getDest() and
     node1.asExpr() = assign.getSource() and
-    node2/*.(PostUpdateNode).getPreUpdateNode()*/.asExpr() = tuple.getSubExpr() and
+    node2.(PostUpdateNode).getPreUpdateNode().asExpr() = tuple.getSubExpr() and
     c.isSingleton(any(Content::TupleContent ct | ct.getIndex() = tuple.getIndex()))
   )
   or

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

@@ -108,15 +108,11 @@ edges
 | test.swift:266:15:266:16 | ...? :  | test.swift:266:15:266:25 | call to signum() :  |
 | test.swift:266:15:266:25 | call to signum() :  | test.swift:266:15:266:25 | OptionalEvaluationExpr |
 | test.swift:277:14:277:26 | (...) [Tuple element at index 1] :  | test.swift:281:15:281:15 | t1 [Tuple element at index 1] :  |
-| test.swift:277:14:277:26 | (...) [Tuple element at index 1] :  | test.swift:287:15:287:15 | t1 [Tuple element at index 1] :  |
-| test.swift:277:14:277:26 | (...) [Tuple element at index 1] :  | test.swift:293:15:293:15 | t1 [Tuple element at index 1] :  |
 | test.swift:277:18:277:25 | call to source() :  | test.swift:277:14:277:26 | (...) [Tuple element at index 1] :  |
 | test.swift:281:15:281:15 | t1 [Tuple element at index 1] :  | test.swift:281:15:281:18 | .1 |
-| test.swift:287:15:287:15 | t1 [Tuple element at index 1] :  | test.swift:287:15:287:18 | .1 |
-| test.swift:289:5:289:5 | t1 [Tuple element at index 0] :  | test.swift:292:15:292:15 | t1 [Tuple element at index 0] :  |
-| test.swift:289:12:289:19 | call to source() :  | test.swift:289:5:289:5 | t1 [Tuple element at index 0] :  |
+| test.swift:289:5:289:5 | [post] t1 [Tuple element at index 0] :  | test.swift:292:15:292:15 | t1 [Tuple element at index 0] :  |
+| test.swift:289:12:289:19 | call to source() :  | test.swift:289:5:289:5 | [post] t1 [Tuple element at index 0] :  |
 | test.swift:292:15:292:15 | t1 [Tuple element at index 0] :  | test.swift:292:15:292:18 | .0 |
-| test.swift:293:15:293:15 | t1 [Tuple element at index 1] :  | test.swift:293:15:293:18 | .1 |
 | test.swift:297:14:297:45 | (...) [Tuple element at index 0] :  | test.swift:302:15:302:15 | t1 [Tuple element at index 0] :  |
 | test.swift:297:14:297:45 | (...) [Tuple element at index 0] :  | test.swift:306:15:306:15 | t2 [Tuple element at index 0] :  |
 | test.swift:297:14:297:45 | (...) [Tuple element at index 1] :  | test.swift:303:15:303:15 | t1 [Tuple element at index 1] :  |
@@ -251,14 +247,10 @@ nodes
 | test.swift:277:18:277:25 | call to source() :  | semmle.label | call to source() :  |
 | test.swift:281:15:281:15 | t1 [Tuple element at index 1] :  | semmle.label | t1 [Tuple element at index 1] :  |
 | test.swift:281:15:281:18 | .1 | semmle.label | .1 |
-| test.swift:287:15:287:15 | t1 [Tuple element at index 1] :  | semmle.label | t1 [Tuple element at index 1] :  |
-| test.swift:287:15:287:18 | .1 | semmle.label | .1 |
-| test.swift:289:5:289:5 | t1 [Tuple element at index 0] :  | semmle.label | t1 [Tuple element at index 0] :  |
+| test.swift:289:5:289:5 | [post] t1 [Tuple element at index 0] :  | semmle.label | [post] t1 [Tuple element at index 0] :  |
 | test.swift:289:12:289:19 | call to source() :  | semmle.label | call to source() :  |
 | test.swift:292:15:292:15 | t1 [Tuple element at index 0] :  | semmle.label | t1 [Tuple element at index 0] :  |
 | test.swift:292:15:292:18 | .0 | semmle.label | .0 |
-| test.swift:293:15:293:15 | t1 [Tuple element at index 1] :  | semmle.label | t1 [Tuple element at index 1] :  |
-| test.swift:293:15:293:18 | .1 | semmle.label | .1 |
 | test.swift:297:14:297:45 | (...) [Tuple element at index 0] :  | semmle.label | (...) [Tuple element at index 0] :  |
 | test.swift:297:14:297:45 | (...) [Tuple element at index 1] :  | semmle.label | (...) [Tuple element at index 1] :  |
 | test.swift:297:18:297:25 | call to source() :  | semmle.label | call to source() :  |
@@ -332,9 +324,7 @@ subpaths
 | test.swift:265:15:265:31 | call to signum() | test.swift:265:15:265:22 | call to source() :  | test.swift:265:15:265:31 | call to signum() | result |
 | test.swift:266:15:266:25 | OptionalEvaluationExpr | test.swift:259:12:259:19 | call to source() :  | test.swift:266:15:266:25 | OptionalEvaluationExpr | result |
 | test.swift:281:15:281:18 | .1 | test.swift:277:18:277:25 | call to source() :  | test.swift:281:15:281:18 | .1 | result |
-| test.swift:287:15:287:18 | .1 | test.swift:277:18:277:25 | call to source() :  | test.swift:287:15:287:18 | .1 | result |
 | test.swift:292:15:292:18 | .0 | test.swift:289:12:289:19 | call to source() :  | test.swift:292:15:292:18 | .0 | result |
-| test.swift:293:15:293:18 | .1 | test.swift:277:18:277:25 | call to source() :  | test.swift:293:15:293:18 | .1 | result |
 | test.swift:302:15:302:18 | .0 | test.swift:297:18:297:25 | call to source() :  | test.swift:302:15:302:18 | .0 | result |
 | test.swift:303:15:303:18 | .1 | test.swift:297:31:297:38 | call to source() :  | test.swift:303:15:303:18 | .1 | result |
 | test.swift:306:15:306:18 | .0 | test.swift:297:18:297:25 | call to source() :  | test.swift:306:15:306:18 | .0 | result |

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

@@ -0,0 +1,2 @@
+| test.swift:287:21:288:1 | // $ flow=277\n | Missing result:flow=277 |
+| test.swift:293:21:294:1 | // $ flow=277\n | Missing result:flow=277 |

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

@@ -195,14 +195,21 @@
 | test.swift:277:9:277:9 | WriteDef | test.swift:279:15:279:15 | t1 |
 | test.swift:277:14:277:26 | (...) | test.swift:277:9:277:9 | WriteDef |
 | test.swift:279:15:279:15 | t1 | test.swift:280:15:280:15 | t1 |
+| test.swift:280:15:280:15 | [post] t1 | test.swift:281:15:281:15 | t1 |
 | test.swift:280:15:280:15 | t1 | test.swift:281:15:281:15 | t1 |
+| test.swift:281:15:281:15 | [post] t1 | test.swift:283:5:283:5 | t1 |
 | test.swift:281:15:281:15 | t1 | test.swift:283:5:283:5 | t1 |
+| test.swift:283:5:283:5 | [post] t1 | test.swift:285:15:285:15 | t1 |
 | test.swift:283:5:283:5 | t1 | test.swift:285:15:285:15 | t1 |
 | test.swift:285:15:285:15 | t1 | test.swift:286:15:286:15 | t1 |
+| test.swift:286:15:286:15 | [post] t1 | test.swift:287:15:287:15 | t1 |
 | test.swift:286:15:286:15 | t1 | test.swift:287:15:287:15 | t1 |
+| test.swift:287:15:287:15 | [post] t1 | test.swift:289:5:289:5 | t1 |
 | test.swift:287:15:287:15 | t1 | test.swift:289:5:289:5 | t1 |
+| test.swift:289:5:289:5 | [post] t1 | test.swift:291:15:291:15 | t1 |
 | test.swift:289:5:289:5 | t1 | test.swift:291:15:291:15 | t1 |
 | test.swift:291:15:291:15 | t1 | test.swift:292:15:292:15 | t1 |
+| test.swift:292:15:292:15 | [post] t1 | test.swift:293:15:293:15 | t1 |
 | test.swift:292:15:292:15 | t1 | test.swift:293:15:293:15 | t1 |
 | test.swift:297:9:297:9 | WriteDef | test.swift:298:14:298:14 | t1 |
 | test.swift:297:14:297:45 | (...) | test.swift:297:9:297:9 | WriteDef |
@@ -217,8 +224,12 @@
 | test.swift:299:21:299:21 | t1 | test.swift:299:9:299:17 | WriteDef |
 | test.swift:299:21:299:21 | t1 | test.swift:301:15:301:15 | t1 |
 | test.swift:301:15:301:15 | t1 | test.swift:302:15:302:15 | t1 |
+| test.swift:302:15:302:15 | [post] t1 | test.swift:303:15:303:15 | t1 |
 | test.swift:302:15:302:15 | t1 | test.swift:303:15:303:15 | t1 |
+| test.swift:303:15:303:15 | [post] t1 | test.swift:304:15:304:15 | t1 |
 | test.swift:303:15:303:15 | t1 | test.swift:304:15:304:15 | t1 |
 | test.swift:305:15:305:15 | t2 | test.swift:306:15:306:15 | t2 |
+| test.swift:306:15:306:15 | [post] t2 | test.swift:307:15:307:15 | t2 |
 | test.swift:306:15:306:15 | t2 | test.swift:307:15:307:15 | t2 |
+| test.swift:307:15:307:15 | [post] t2 | test.swift:308:15:308:15 | t2 |
 | test.swift:307:15:307:15 | t2 | test.swift:308:15:308:15 | t2 |

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

@@ -284,13 +284,13 @@ func testTuples() {
 
     sink(arg: t1)
     sink(arg: t1.0)
-    sink(arg: t1.1) // $ SPURIOUS: flow=277
+    sink(arg: t1.1) // $ flow=277
 
     t1.0 = source()
 
     sink(arg: t1)
     sink(arg: t1.0) // $ flow=289
-    sink(arg: t1.1) // $ SPURIOUS: flow=277
+    sink(arg: t1.1) // $ flow=277
 }
 
 func testTuples2() {