Skip to content

Commit 56c46d7

Browse files
aschackmullaschackmull
committed
Java/Rust/Swift: Accept qltest changes.
1 parent b4daba3 commit 56c46d7

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

‎java/ql/test/library-tests/dataflow/capture/test.expected

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
| A.java:21:11:21:13 | "B" : String | A.java:15:16:15:22 | get(...) : String |
1919
| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | ...=... : String |
2020
| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | SSA phi(s) : String |
21-
| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | phi(String s) : String |
2221
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | String s : String |
2322
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
2423
| A.java:21:11:21:13 | "B" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -35,7 +34,6 @@
3534
| A.java:23:11:23:13 | "C" : String | A.java:15:16:15:22 | get(...) : String |
3635
| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | ...=... : String |
3736
| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | SSA phi(s) : String |
38-
| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | phi(String s) : String |
3937
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | String s : String |
4038
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
4139
| A.java:23:11:23:13 | "C" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |

‎rust/ql/test/library-tests/dataflow/local/CONSISTENCY/DataFlowConsistency.expected

-2
This file was deleted.

‎rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

+4-5
Original file line numberDiff line numberDiff line change
@@ -647,10 +647,9 @@ localStep
647647
| main.rs:441:24:441:33 | [post] receiver for source(...) | main.rs:441:24:441:33 | [post] source(...) |
648648
| main.rs:441:24:441:33 | source(...) | main.rs:441:24:441:33 | receiver for source(...) |
649649
| main.rs:441:24:441:45 | ... .to_string(...) | main.rs:441:9:441:20 | default_name |
650-
| main.rs:441:24:441:45 | ... .to_string(...) | main.rs:442:9:442:20 | phi(default_name) |
650+
| main.rs:441:24:441:45 | ... .to_string(...) | main.rs:442:9:442:20 | SSA phi read(default_name) |
651651
| main.rs:442:5:448:5 | for ... in ... { ... } | main.rs:440:75:449:1 | { ... } |
652-
| main.rs:442:9:442:20 | phi(default_name) | main.rs:442:9:442:20 | phi(default_name) |
653-
| main.rs:442:9:442:20 | phi(default_name) | main.rs:444:41:444:67 | default_name |
652+
| main.rs:442:9:442:20 | SSA phi read(default_name) | main.rs:444:41:444:67 | default_name |
654653
| main.rs:442:10:442:13 | [SSA] cond | main.rs:443:12:443:15 | cond |
655654
| main.rs:442:10:442:13 | cond | main.rs:442:10:442:13 | [SSA] cond |
656655
| main.rs:442:10:442:13 | cond | main.rs:442:10:442:13 | cond |
@@ -664,9 +663,9 @@ localStep
664663
| main.rs:444:21:444:24 | [post] receiver for name | main.rs:444:21:444:24 | [post] name |
665664
| main.rs:444:21:444:24 | name | main.rs:444:21:444:24 | receiver for name |
666665
| main.rs:444:21:444:68 | name.unwrap_or_else(...) | main.rs:444:17:444:17 | n |
667-
| main.rs:444:41:444:67 | [post] default_name | main.rs:442:9:442:20 | phi(default_name) |
666+
| main.rs:444:41:444:67 | [post] default_name | main.rs:442:9:442:20 | SSA phi read(default_name) |
668667
| main.rs:444:41:444:67 | closure self in \|...\| ... | main.rs:444:44:444:55 | this |
669-
| main.rs:444:41:444:67 | default_name | main.rs:442:9:442:20 | phi(default_name) |
668+
| main.rs:444:41:444:67 | default_name | main.rs:442:9:442:20 | SSA phi read(default_name) |
670669
| main.rs:444:44:444:55 | [post] receiver for default_name | main.rs:444:44:444:55 | [post] default_name |
671670
| main.rs:444:44:444:55 | default_name | main.rs:444:44:444:55 | receiver for default_name |
672671
| main.rs:445:18:445:18 | [post] receiver for n | main.rs:445:18:445:18 | [post] n |

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1378,17 +1378,17 @@
13781378
| test.swift:888:9:888:9 | stream | test.swift:888:9:888:9 | SSA def(stream) |
13791379
| test.swift:888:18:896:6 | call to AsyncStream<Element>.init(_:bufferingPolicy:_:) | test.swift:888:9:888:9 | stream |
13801380
| test.swift:889:9:889:9 | continuation | test.swift:890:27:895:13 | continuation |
1381-
| test.swift:890:27:895:13 | closure self parameter | test.swift:891:17:891:17 | phi(this) |
1381+
| test.swift:890:27:895:13 | closure self parameter | test.swift:891:17:891:17 | SSA phi read(this) |
13821382
| test.swift:891:17:891:17 | $generator | test.swift:891:17:891:17 | &... |
13831383
| test.swift:891:17:891:17 | &... | test.swift:891:17:891:17 | $generator |
1384+
| test.swift:891:17:891:17 | SSA phi read(this) | test.swift:892:21:892:21 | this |
1385+
| test.swift:891:17:891:17 | SSA phi read(this) | test.swift:894:17:894:17 | this |
13841386
| test.swift:891:17:891:17 | [post] $generator | test.swift:891:17:891:17 | &... |
1385-
| test.swift:891:17:891:17 | phi(this) | test.swift:892:21:892:21 | this |
1386-
| test.swift:891:17:891:17 | phi(this) | test.swift:894:17:894:17 | this |
13871387
| test.swift:891:26:891:26 | $generator | test.swift:891:26:891:26 | SSA def($generator) |
13881388
| test.swift:891:26:891:26 | SSA def($generator) | test.swift:891:17:891:17 | $generator |
13891389
| test.swift:891:26:891:30 | call to makeIterator() | test.swift:891:26:891:26 | $generator |
1390-
| test.swift:892:21:892:21 | this | test.swift:891:17:891:17 | phi(this) |
1391-
| test.swift:892:21:892:21 | this | test.swift:891:17:891:17 | phi(this) |
1390+
| test.swift:892:21:892:21 | this | test.swift:891:17:891:17 | SSA phi read(this) |
1391+
| test.swift:892:21:892:21 | this | test.swift:891:17:891:17 | SSA phi read(this) |
13921392
| test.swift:898:5:898:5 | $i$generator | test.swift:898:5:898:5 | &... |
13931393
| test.swift:898:5:898:5 | &... | test.swift:898:5:898:5 | $i$generator |
13941394
| test.swift:898:5:898:5 | [post] $i$generator | test.swift:898:5:898:5 | &... |

0 commit comments

Comments
 (0)