Skip to content

Commit ac1fb5b

Browse files
asgerfasgerf
committed
unified: Update test and remove TODO
1 parent 768c03a commit ac1fb5b

2 files changed

Lines changed: 49 additions & 45 deletions

File tree

‎unified/ql/test/library-tests/dataflow/test.expected‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,16 @@ edges
6666
| enums.swift:48:12:48:12 | e [case2.0] | enums.swift:49:10:49:23 | ... .case2(...) [case2.0] | provenance | |
6767
| enums.swift:49:10:49:23 | ... .case2(...) [case2.0] | enums.swift:49:22:49:22 | x | provenance | |
6868
| enums.swift:49:22:49:22 | x | enums.swift:50:14:50:14 | x | provenance | |
69-
| enums.swift:57:9:57:13 | opt_x [some.0] | enums.swift:58:19:58:23 | opt_x [some.0] | provenance | |
70-
| enums.swift:57:17:57:45 | ... .some(...) [some.0] | enums.swift:57:9:57:13 | opt_x [some.0] | provenance | |
71-
| enums.swift:57:31:57:44 | source(...) | enums.swift:57:17:57:45 | ... .some(...) [some.0] | provenance | |
72-
| enums.swift:58:11:58:15 | ... .some(...) [some.0] | enums.swift:58:15:58:15 | x | provenance | |
69+
| enums.swift:57:9:57:13 | opt_x | enums.swift:58:19:58:23 | opt_x | provenance | |
70+
| enums.swift:57:31:57:44 | source(...) | enums.swift:57:9:57:13 | opt_x | provenance | |
71+
| enums.swift:58:11:58:15 | ... .some(...) | enums.swift:58:15:58:15 | x | provenance | |
7372
| enums.swift:58:15:58:15 | x | enums.swift:59:10:59:10 | x | provenance | |
74-
| enums.swift:58:19:58:23 | opt_x [some.0] | enums.swift:58:11:58:15 | ... .some(...) [some.0] | provenance | |
75-
| enums.swift:63:9:63:13 | opt_x [some.0] | enums.swift:64:15:64:19 | opt_x [some.0] | provenance | |
76-
| enums.swift:63:17:63:45 | ... .some(...) [some.0] | enums.swift:63:9:63:13 | opt_x [some.0] | provenance | |
77-
| enums.swift:63:31:63:44 | source(...) | enums.swift:63:17:63:45 | ... .some(...) [some.0] | provenance | |
78-
| enums.swift:64:11:64:19 | ... .some(...) [some.0] | enums.swift:64:15:64:19 | opt_x | provenance | |
73+
| enums.swift:58:19:58:23 | opt_x | enums.swift:58:11:58:15 | ... .some(...) | provenance | |
74+
| enums.swift:63:9:63:13 | opt_x | enums.swift:64:15:64:19 | opt_x | provenance | |
75+
| enums.swift:63:31:63:44 | source(...) | enums.swift:63:9:63:13 | opt_x | provenance | |
76+
| enums.swift:64:11:64:19 | ... .some(...) | enums.swift:64:15:64:19 | opt_x | provenance | |
77+
| enums.swift:64:15:64:19 | opt_x | enums.swift:64:11:64:19 | ... .some(...) | provenance | |
7978
| enums.swift:64:15:64:19 | opt_x | enums.swift:65:10:65:14 | opt_x | provenance | |
80-
| enums.swift:64:15:64:19 | opt_x [some.0] | enums.swift:64:11:64:19 | ... .some(...) [some.0] | provenance | |
8179
| enums.swift:73:9:73:9 | e [foo.0] | enums.swift:74:12:74:12 | e [foo.0] | provenance | |
8280
| enums.swift:73:9:73:9 | e [foo.0] | enums.swift:82:12:82:12 | e [foo.0] | provenance | |
8381
| enums.swift:73:13:73:48 | ... .foo(...) [foo.0] | enums.swift:73:9:73:9 | e [foo.0] | provenance | |
@@ -241,29 +239,26 @@ edges
241239
| test.swift:200:14:200:46 | throwingIdentity(...) | test.swift:200:10:200:46 | try ... | provenance | |
242240
| test.swift:200:31:200:45 | source(...) | test.swift:191:25:191:25 | s | provenance | |
243241
| test.swift:200:31:200:45 | source(...) | test.swift:200:14:200:46 | throwingIdentity(...) | provenance | |
244-
| test.swift:201:9:201:11 | opt [some.0] | test.swift:202:12:202:14 | opt [some.0] | provenance | |
245-
| test.swift:201:15:201:52 | try? ... [some.0] | test.swift:201:9:201:11 | opt [some.0] | provenance | |
246-
| test.swift:201:20:201:52 | throwingIdentity(...) | test.swift:201:15:201:52 | try? ... [some.0] | provenance | |
242+
| test.swift:201:9:201:11 | opt | test.swift:202:12:202:14 | opt | provenance | |
243+
| test.swift:201:20:201:52 | throwingIdentity(...) | test.swift:201:9:201:11 | opt | provenance | |
247244
| test.swift:201:37:201:51 | source(...) | test.swift:191:25:191:25 | s | provenance | |
248245
| test.swift:201:37:201:51 | source(...) | test.swift:201:20:201:52 | throwingIdentity(...) | provenance | |
249-
| test.swift:202:8:202:14 | ... .some(...) [some.0] | test.swift:202:12:202:14 | opt | provenance | |
246+
| test.swift:202:8:202:14 | ... .some(...) | test.swift:202:12:202:14 | opt | provenance | |
247+
| test.swift:202:12:202:14 | opt | test.swift:202:8:202:14 | ... .some(...) | provenance | |
250248
| test.swift:202:12:202:14 | opt | test.swift:203:14:203:16 | opt | provenance | |
251-
| test.swift:202:12:202:14 | opt [some.0] | test.swift:202:8:202:14 | ... .some(...) [some.0] | provenance | |
252249
| test.swift:205:15:205:47 | throwingIdentity(...) | test.swift:205:10:205:47 | try! ... | provenance | |
253250
| test.swift:205:32:205:46 | source(...) | test.swift:191:25:191:25 | s | provenance | |
254251
| test.swift:205:32:205:46 | source(...) | test.swift:205:15:205:47 | throwingIdentity(...) | provenance | |
255252
| test.swift:209:20:209:57 | asyncThrowingIdentity(...) | test.swift:209:10:209:57 | try ... | provenance | |
256253
| test.swift:209:42:209:56 | source(...) | test.swift:193:30:193:30 | s | provenance | |
257254
| test.swift:209:42:209:56 | source(...) | test.swift:209:20:209:57 | asyncThrowingIdentity(...) | provenance | |
258-
| test.swift:210:9:210:11 | opt [some.0] | test.swift:211:12:211:14 | opt [some.0] | provenance | |
259-
| test.swift:210:15:210:63 | try? ... [some.0] | test.swift:210:9:210:11 | opt [some.0] | provenance | |
260-
| test.swift:210:20:210:63 | await ... | test.swift:210:15:210:63 | try? ... [some.0] | provenance | |
261-
| test.swift:210:26:210:63 | asyncThrowingIdentity(...) | test.swift:210:20:210:63 | await ... | provenance | |
255+
| test.swift:210:9:210:11 | opt | test.swift:211:12:211:14 | opt | provenance | |
256+
| test.swift:210:26:210:63 | asyncThrowingIdentity(...) | test.swift:210:9:210:11 | opt | provenance | |
262257
| test.swift:210:48:210:62 | source(...) | test.swift:193:30:193:30 | s | provenance | |
263258
| test.swift:210:48:210:62 | source(...) | test.swift:210:26:210:63 | asyncThrowingIdentity(...) | provenance | |
264-
| test.swift:211:8:211:14 | ... .some(...) [some.0] | test.swift:211:12:211:14 | opt | provenance | |
259+
| test.swift:211:8:211:14 | ... .some(...) | test.swift:211:12:211:14 | opt | provenance | |
260+
| test.swift:211:12:211:14 | opt | test.swift:211:8:211:14 | ... .some(...) | provenance | |
265261
| test.swift:211:12:211:14 | opt | test.swift:212:14:212:16 | opt | provenance | |
266-
| test.swift:211:12:211:14 | opt [some.0] | test.swift:211:8:211:14 | ... .some(...) [some.0] | provenance | |
267262
| test.swift:214:21:214:58 | asyncThrowingIdentity(...) | test.swift:214:10:214:58 | try! ... | provenance | |
268263
| test.swift:214:43:214:57 | source(...) | test.swift:193:30:193:30 | s | provenance | |
269264
| test.swift:214:43:214:57 | source(...) | test.swift:214:21:214:58 | asyncThrowingIdentity(...) | provenance | |
@@ -273,16 +268,22 @@ edges
273268
| test.swift:218:13:218:27 | source(...) | test.swift:218:9:218:9 | x | provenance | |
274269
| test.swift:219:10:219:10 | x | test.swift:219:10:219:20 | TypeCastExpr | provenance | |
275270
| test.swift:220:10:220:10 | x | test.swift:220:10:220:21 | TypeCastExpr | provenance | |
276-
| test.swift:221:8:221:12 | ... .some(...) [some.0] | test.swift:221:12:221:12 | y | provenance | |
271+
| test.swift:221:8:221:12 | ... .some(...) | test.swift:221:12:221:12 | y | provenance | |
277272
| test.swift:221:12:221:12 | y | test.swift:222:14:222:14 | y | provenance | |
278-
| test.swift:221:16:221:16 | x | test.swift:221:16:221:27 | TypeCastExpr [some.0] | provenance | |
279-
| test.swift:221:16:221:27 | TypeCastExpr [some.0] | test.swift:221:8:221:12 | ... .some(...) [some.0] | provenance | |
273+
| test.swift:221:16:221:16 | x | test.swift:221:8:221:12 | ... .some(...) | provenance | |
280274
| test.swift:227:9:227:9 | x [ArrayElement] | test.swift:228:20:228:20 | x [ArrayElement] | provenance | |
281275
| test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | test.swift:227:9:227:9 | x [ArrayElement] | provenance | |
282276
| test.swift:227:14:227:28 | source(...) | test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | provenance | |
283277
| test.swift:227:31:227:45 | source(...) | test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | provenance | |
284278
| test.swift:228:9:228:15 | element | test.swift:229:14:229:20 | element | provenance | |
285279
| test.swift:228:20:228:20 | x [ArrayElement] | test.swift:228:9:228:15 | element | provenance | |
280+
| test.swift:243:16:243:45 | ... .some(...) | test.swift:246:18:246:30 | getOptional(...) | provenance | |
281+
| test.swift:243:30:243:44 | source(...) | test.swift:243:16:243:45 | ... .some(...) | provenance | |
282+
| test.swift:246:9:246:9 | x | test.swift:247:12:247:12 | x | provenance | |
283+
| test.swift:246:18:246:30 | getOptional(...) | test.swift:246:9:246:9 | x | provenance | |
284+
| test.swift:247:8:247:12 | ... .some(...) | test.swift:247:12:247:12 | x | provenance | |
285+
| test.swift:247:12:247:12 | x | test.swift:247:8:247:12 | ... .some(...) | provenance | |
286+
| test.swift:247:12:247:12 | x | test.swift:248:14:248:14 | x | provenance | |
286287
nodes
287288
| calls.swift:7:19:7:19 | x | semmle.label | x |
288289
| calls.swift:8:14:8:14 | x | semmle.label | x |
@@ -364,19 +365,17 @@ nodes
364365
| enums.swift:49:10:49:23 | ... .case2(...) [case2.0] | semmle.label | ... .case2(...) [case2.0] |
365366
| enums.swift:49:22:49:22 | x | semmle.label | x |
366367
| enums.swift:50:14:50:14 | x | semmle.label | x |
367-
| enums.swift:57:9:57:13 | opt_x [some.0] | semmle.label | opt_x [some.0] |
368-
| enums.swift:57:17:57:45 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
368+
| enums.swift:57:9:57:13 | opt_x | semmle.label | opt_x |
369369
| enums.swift:57:31:57:44 | source(...) | semmle.label | source(...) |
370-
| enums.swift:58:11:58:15 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
370+
| enums.swift:58:11:58:15 | ... .some(...) | semmle.label | ... .some(...) |
371371
| enums.swift:58:15:58:15 | x | semmle.label | x |
372-
| enums.swift:58:19:58:23 | opt_x [some.0] | semmle.label | opt_x [some.0] |
372+
| enums.swift:58:19:58:23 | opt_x | semmle.label | opt_x |
373373
| enums.swift:59:10:59:10 | x | semmle.label | x |
374-
| enums.swift:63:9:63:13 | opt_x [some.0] | semmle.label | opt_x [some.0] |
375-
| enums.swift:63:17:63:45 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
374+
| enums.swift:63:9:63:13 | opt_x | semmle.label | opt_x |
376375
| enums.swift:63:31:63:44 | source(...) | semmle.label | source(...) |
377-
| enums.swift:64:11:64:19 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
376+
| enums.swift:64:11:64:19 | ... .some(...) | semmle.label | ... .some(...) |
377+
| enums.swift:64:15:64:19 | opt_x | semmle.label | opt_x |
378378
| enums.swift:64:15:64:19 | opt_x | semmle.label | opt_x |
379-
| enums.swift:64:15:64:19 | opt_x [some.0] | semmle.label | opt_x [some.0] |
380379
| enums.swift:65:10:65:14 | opt_x | semmle.label | opt_x |
381380
| enums.swift:73:9:73:9 | e [foo.0] | semmle.label | e [foo.0] |
382381
| enums.swift:73:13:73:48 | ... .foo(...) [foo.0] | semmle.label | ... .foo(...) [foo.0] |
@@ -587,28 +586,25 @@ nodes
587586
| test.swift:200:10:200:46 | try ... | semmle.label | try ... |
588587
| test.swift:200:14:200:46 | throwingIdentity(...) | semmle.label | throwingIdentity(...) |
589588
| test.swift:200:31:200:45 | source(...) | semmle.label | source(...) |
590-
| test.swift:201:9:201:11 | opt [some.0] | semmle.label | opt [some.0] |
591-
| test.swift:201:15:201:52 | try? ... [some.0] | semmle.label | try? ... [some.0] |
589+
| test.swift:201:9:201:11 | opt | semmle.label | opt |
592590
| test.swift:201:20:201:52 | throwingIdentity(...) | semmle.label | throwingIdentity(...) |
593591
| test.swift:201:37:201:51 | source(...) | semmle.label | source(...) |
594-
| test.swift:202:8:202:14 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
592+
| test.swift:202:8:202:14 | ... .some(...) | semmle.label | ... .some(...) |
593+
| test.swift:202:12:202:14 | opt | semmle.label | opt |
595594
| test.swift:202:12:202:14 | opt | semmle.label | opt |
596-
| test.swift:202:12:202:14 | opt [some.0] | semmle.label | opt [some.0] |
597595
| test.swift:203:14:203:16 | opt | semmle.label | opt |
598596
| test.swift:205:10:205:47 | try! ... | semmle.label | try! ... |
599597
| test.swift:205:15:205:47 | throwingIdentity(...) | semmle.label | throwingIdentity(...) |
600598
| test.swift:205:32:205:46 | source(...) | semmle.label | source(...) |
601599
| test.swift:209:10:209:57 | try ... | semmle.label | try ... |
602600
| test.swift:209:20:209:57 | asyncThrowingIdentity(...) | semmle.label | asyncThrowingIdentity(...) |
603601
| test.swift:209:42:209:56 | source(...) | semmle.label | source(...) |
604-
| test.swift:210:9:210:11 | opt [some.0] | semmle.label | opt [some.0] |
605-
| test.swift:210:15:210:63 | try? ... [some.0] | semmle.label | try? ... [some.0] |
606-
| test.swift:210:20:210:63 | await ... | semmle.label | await ... |
602+
| test.swift:210:9:210:11 | opt | semmle.label | opt |
607603
| test.swift:210:26:210:63 | asyncThrowingIdentity(...) | semmle.label | asyncThrowingIdentity(...) |
608604
| test.swift:210:48:210:62 | source(...) | semmle.label | source(...) |
609-
| test.swift:211:8:211:14 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
605+
| test.swift:211:8:211:14 | ... .some(...) | semmle.label | ... .some(...) |
606+
| test.swift:211:12:211:14 | opt | semmle.label | opt |
610607
| test.swift:211:12:211:14 | opt | semmle.label | opt |
611-
| test.swift:211:12:211:14 | opt [some.0] | semmle.label | opt [some.0] |
612608
| test.swift:212:14:212:16 | opt | semmle.label | opt |
613609
| test.swift:214:10:214:58 | try! ... | semmle.label | try! ... |
614610
| test.swift:214:21:214:58 | asyncThrowingIdentity(...) | semmle.label | asyncThrowingIdentity(...) |
@@ -619,10 +615,9 @@ nodes
619615
| test.swift:219:10:219:20 | TypeCastExpr | semmle.label | TypeCastExpr |
620616
| test.swift:220:10:220:10 | x | semmle.label | x |
621617
| test.swift:220:10:220:21 | TypeCastExpr | semmle.label | TypeCastExpr |
622-
| test.swift:221:8:221:12 | ... .some(...) [some.0] | semmle.label | ... .some(...) [some.0] |
618+
| test.swift:221:8:221:12 | ... .some(...) | semmle.label | ... .some(...) |
623619
| test.swift:221:12:221:12 | y | semmle.label | y |
624620
| test.swift:221:16:221:16 | x | semmle.label | x |
625-
| test.swift:221:16:221:27 | TypeCastExpr [some.0] | semmle.label | TypeCastExpr [some.0] |
626621
| test.swift:222:14:222:14 | y | semmle.label | y |
627622
| test.swift:227:9:227:9 | x [ArrayElement] | semmle.label | x [ArrayElement] |
628623
| test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | semmle.label | ArrayLiteral [ArrayElement] |
@@ -631,6 +626,14 @@ nodes
631626
| test.swift:228:9:228:15 | element | semmle.label | element |
632627
| test.swift:228:20:228:20 | x [ArrayElement] | semmle.label | x [ArrayElement] |
633628
| test.swift:229:14:229:20 | element | semmle.label | element |
629+
| test.swift:243:16:243:45 | ... .some(...) | semmle.label | ... .some(...) |
630+
| test.swift:243:30:243:44 | source(...) | semmle.label | source(...) |
631+
| test.swift:246:9:246:9 | x | semmle.label | x |
632+
| test.swift:246:18:246:30 | getOptional(...) | semmle.label | getOptional(...) |
633+
| test.swift:247:8:247:12 | ... .some(...) | semmle.label | ... .some(...) |
634+
| test.swift:247:12:247:12 | x | semmle.label | x |
635+
| test.swift:247:12:247:12 | x | semmle.label | x |
636+
| test.swift:248:14:248:14 | x | semmle.label | x |
634637
subpaths
635638
| calls.swift:31:17:31:30 | source(...) | calls.swift:28:19:28:19 | x | calls.swift:29:16:29:24 | ... + ... | calls.swift:31:10:31:31 | target(...) |
636639
| calls.swift:32:17:32:30 | source(...) | calls.swift:28:19:28:19 | x | calls.swift:29:16:29:24 | ... + ... | calls.swift:32:10:32:31 | target(...) |
@@ -730,3 +733,4 @@ testFailures
730733
| test.swift:222:14:222:14 | y | test.swift:218:13:218:27 | source(...) | test.swift:222:14:222:14 | y | $@ | test.swift:218:13:218:27 | source(...) | source(...) |
731734
| test.swift:229:14:229:20 | element | test.swift:227:14:227:28 | source(...) | test.swift:229:14:229:20 | element | $@ | test.swift:227:14:227:28 | source(...) | source(...) |
732735
| test.swift:229:14:229:20 | element | test.swift:227:31:227:45 | source(...) | test.swift:229:14:229:20 | element | $@ | test.swift:227:31:227:45 | source(...) | source(...) |
736+
| test.swift:248:14:248:14 | x | test.swift:243:30:243:44 | source(...) | test.swift:248:14:248:14 | x | $@ | test.swift:243:30:243:44 | source(...) | source(...) |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ func t27() {
242242
func getOptional() throws -> String? {
243243
return Optional.some(source("t27.1"))
244244
}
245-
// TODO: try? should not double-wrap in Optional
245+
// try? should not double-wrap in Optional
246246
let x = try? getOptional()
247247
if let x {
248-
sink(x) // $ MISSING: hasValueFlow=t27.1
248+
sink(x) // $ hasValueFlow=t27.1
249249
}
250250
}

0 commit comments

Comments
 (0)