Skip to content

Commit 4434b7b

Browse files
aschackmullaschackmull
committed
Java: Accept new locations for SSA definitions.
1 parent 732a81e commit 4434b7b

File tree

6 files changed

+127
-127
lines changed

6 files changed

+127
-127
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
| A.java:21:11:21:13 | "B" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
1717
| A.java:21:11:21:13 | "B" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
1818
| A.java:21:11:21:13 | "B" : String | A.java:15:16:15:22 | get(...) : String |
19+
| A.java:21:11:21:13 | "B" : String | A.java:20:5:20:15 | SSA phi(s) : String |
1920
| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | ...=... : String |
20-
| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | SSA phi(s) : String |
2121
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | String s : String |
2222
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
2323
| A.java:21:11:21:13 | "B" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -32,8 +32,8 @@
3232
| A.java:23:11:23:13 | "C" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
3333
| A.java:23:11:23:13 | "C" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
3434
| A.java:23:11:23:13 | "C" : String | A.java:15:16:15:22 | get(...) : String |
35+
| A.java:23:11:23:13 | "C" : String | A.java:20:5:20:15 | SSA phi(s) : String |
3536
| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | ...=... : String |
36-
| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | SSA phi(s) : String |
3737
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | String s : String |
3838
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
3939
| A.java:23:11:23:13 | "C" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |

‎java/ql/test/library-tests/ssa/captures.expected‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
| Nested.java:8:29:8:57 | SSA capture def(next(..).p1) | Nested.java:4:34:10:3 | SSA param(p1) |
2-
| Nested.java:8:29:8:57 | SSA capture def(next(..).x1) | Nested.java:5:9:5:14 | SSA def(x1) |
1+
| Nested.java:8:22:8:25 | SSA capture def(next(..).p1) | Nested.java:4:21:4:24 | SSA param(p1) |
2+
| Nested.java:8:22:8:25 | SSA capture def(next(..).x1) | Nested.java:5:9:5:14 | SSA def(x1) |
33
| Nested.java:16:22:16:34 | SSA capture def(getInt(..).obj) | Nested.java:15:12:15:29 | SSA def(obj) |
4-
| Nested.java:19:27:22:7 | SSA capture def(getInt(..).hash) | Nested.java:16:15:16:34 | SSA def(hash) |
5-
| Nested.java:19:27:22:7 | SSA capture def(getInt(..).x2) | Nested.java:17:9:17:15 | SSA def(x2) |
4+
| Nested.java:19:18:19:23 | SSA capture def(getInt(..).hash) | Nested.java:16:15:16:34 | SSA def(hash) |
5+
| Nested.java:19:18:19:23 | SSA capture def(getInt(..).x2) | Nested.java:17:9:17:15 | SSA def(x2) |
66
| Nested.java:20:27:20:39 | SSA capture def(getInt(..).obj) | Nested.java:15:12:15:29 | SSA def(obj) |
7-
| Nested.java:30:23:30:36 | SSA capture def(getInt(..).obj2) | Nested.java:30:5:30:37 | SSA phi(obj2) |
8-
| Nested.java:37:20:37:25 | SSA capture def(getInt(..).x3) | Nested.java:36:7:36:12 | SSA def(x3) |
9-
| Nested.java:40:20:40:25 | SSA capture def(getInt(..).x3) | Nested.java:39:7:39:12 | SSA def(x3) |
7+
| Nested.java:30:23:30:36 | SSA capture def(getInt(..).obj2) | Nested.java:25:5:25:24 | SSA phi(obj2) |
8+
| Nested.java:37:14:37:25 | SSA capture def(getInt(..).x3) | Nested.java:36:7:36:12 | SSA def(x3) |
9+
| Nested.java:40:14:40:25 | SSA capture def(getInt(..).x3) | Nested.java:39:7:39:12 | SSA def(x3) |

‎java/ql/test/library-tests/ssa/firstUse.expected‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
| Fields.java:12:19:21:3 | SSA entry def(this.xs) | Fields.java:13:15:13:16 | xs |
1+
| Fields.java:12:15:12:15 | SSA entry def(this.xs) | Fields.java:13:15:13:16 | xs |
22
| Fields.java:14:5:14:9 | SSA call def(this.xs) | Fields.java:15:9:15:10 | xs |
33
| Fields.java:15:5:15:10 | SSA def(x) | Fields.java:16:9:16:9 | x |
4+
| Fields.java:16:5:16:17 | SSA phi(this.xs) | Fields.java:18:9:18:15 | this.xs |
45
| Fields.java:17:7:17:11 | SSA call def(this.xs) | Fields.java:18:9:18:15 | this.xs |
5-
| Fields.java:18:5:18:16 | SSA phi(this.xs) | Fields.java:18:9:18:15 | this.xs |
66
| Fields.java:19:5:19:19 | SSA def(this.xs) | Fields.java:20:9:20:10 | xs |
7-
| Fields.java:23:19:49:3 | SSA entry def(Fields.stat) | Fields.java:27:15:27:18 | stat |
8-
| Fields.java:23:19:49:3 | SSA entry def(this.xs) | Fields.java:26:15:26:16 | xs |
7+
| Fields.java:23:15:23:15 | SSA entry def(Fields.stat) | Fields.java:27:15:27:18 | stat |
8+
| Fields.java:23:15:23:15 | SSA entry def(this.xs) | Fields.java:26:15:26:16 | xs |
99
| Fields.java:24:12:24:27 | SSA def(f) | Fields.java:25:15:25:15 | f |
1010
| Fields.java:24:12:24:27 | SSA qualifier def(f.xs) | Fields.java:25:15:25:18 | f.xs |
1111
| Fields.java:24:16:24:27 | SSA call def(Fields.stat) | Fields.java:27:15:27:18 | stat |
@@ -18,52 +18,52 @@
1818
| Fields.java:36:5:36:19 | SSA def(this.xs) | Fields.java:38:9:38:10 | xs |
1919
| Fields.java:39:5:39:21 | SSA def(f.xs) | Fields.java:40:9:40:12 | f.xs |
2020
| Fields.java:41:5:41:10 | SSA def(z) | Fields.java:42:9:42:9 | z |
21+
| Fields.java:42:5:42:17 | SSA phi(Fields.stat) | Fields.java:48:9:48:12 | stat |
22+
| Fields.java:42:5:42:17 | SSA phi(f) | Fields.java:44:9:44:9 | f |
23+
| Fields.java:42:5:42:17 | SSA phi(f.xs) | Fields.java:44:9:44:12 | f.xs |
2124
| Fields.java:43:7:43:22 | SSA def(f) | Fields.java:44:9:44:9 | f |
2225
| Fields.java:43:7:43:22 | SSA qualifier def(f.xs) | Fields.java:44:9:44:12 | f.xs |
2326
| Fields.java:43:11:43:22 | SSA call def(Fields.stat) | Fields.java:48:9:48:12 | stat |
24-
| Fields.java:44:5:44:13 | SSA phi(Fields.stat) | Fields.java:48:9:48:12 | stat |
25-
| Fields.java:44:5:44:13 | SSA phi(f) | Fields.java:44:9:44:9 | f |
26-
| Fields.java:44:5:44:13 | SSA phi(f.xs) | Fields.java:44:9:44:12 | f.xs |
2727
| Fields.java:45:5:45:16 | SSA call def(Fields.stat) | Fields.java:48:9:48:12 | stat |
28-
| Nested.java:8:29:8:57 | SSA capture def(next(..).p1) | Nested.java:8:38:8:39 | p1 |
29-
| Nested.java:8:29:8:57 | SSA capture def(next(..).x1) | Nested.java:8:43:8:44 | x1 |
28+
| Nested.java:8:22:8:25 | SSA capture def(next(..).p1) | Nested.java:8:38:8:39 | p1 |
29+
| Nested.java:8:22:8:25 | SSA capture def(next(..).x1) | Nested.java:8:43:8:44 | x1 |
3030
| Nested.java:16:22:16:34 | SSA capture def(getInt(..).obj) | Nested.java:16:22:16:24 | obj |
3131
| Nested.java:18:15:23:5 | SSA def(h2) | Nested.java:25:9:25:10 | h2 |
32-
| Nested.java:19:27:22:7 | SSA capture def(getInt(..).hash) | Nested.java:21:21:21:24 | hash |
33-
| Nested.java:19:27:22:7 | SSA capture def(getInt(..).x2) | Nested.java:21:16:21:17 | x2 |
32+
| Nested.java:19:18:19:23 | SSA capture def(getInt(..).hash) | Nested.java:21:21:21:24 | hash |
33+
| Nested.java:19:18:19:23 | SSA capture def(getInt(..).x2) | Nested.java:21:16:21:17 | x2 |
3434
| Nested.java:20:19:20:39 | SSA def(hnest) | Nested.java:21:37:21:41 | hnest |
3535
| Nested.java:20:27:20:39 | SSA capture def(getInt(..).obj) | Nested.java:20:27:20:29 | obj |
3636
| Nested.java:30:23:30:36 | SSA capture def(getInt(..).obj2) | Nested.java:30:23:30:26 | obj2 |
37-
| Nested.java:33:29:42:3 | SSA param(p3) | Nested.java:35:9:35:10 | p3 |
38-
| Nested.java:37:20:37:25 | SSA capture def(getInt(..).x3) | Nested.java:37:20:37:21 | x3 |
39-
| Nested.java:40:20:40:25 | SSA capture def(getInt(..).x3) | Nested.java:40:20:40:21 | x3 |
40-
| Test.java:4:19:32:2 | SSA param(param) | Test.java:9:7:9:11 | param |
37+
| Nested.java:33:13:33:19 | SSA param(p3) | Nested.java:35:9:35:10 | p3 |
38+
| Nested.java:37:14:37:25 | SSA capture def(getInt(..).x3) | Nested.java:37:20:37:21 | x3 |
39+
| Nested.java:40:14:40:25 | SSA capture def(getInt(..).x3) | Nested.java:40:20:40:21 | x3 |
40+
| Test.java:4:6:4:6 | SSA param(param) | Test.java:9:7:9:11 | param |
4141
| Test.java:6:7:6:11 | SSA def(x) | Test.java:10:4:10:4 | x |
4242
| Test.java:6:7:6:11 | SSA def(x) | Test.java:20:10:20:10 | x |
43+
| Test.java:9:3:9:16 | SSA phi(x) | Test.java:20:10:20:10 | x |
44+
| Test.java:9:3:9:16 | SSA phi(y) | Test.java:20:14:20:14 | y |
4345
| Test.java:10:4:10:6 | SSA def(x) | Test.java:11:10:11:10 | x |
4446
| Test.java:11:4:11:10 | SSA def(y) | Test.java:20:14:20:14 | y |
4547
| Test.java:11:8:11:10 | SSA def(x) | Test.java:20:10:20:10 | x |
4648
| Test.java:14:4:14:8 | SSA def(y) | Test.java:15:4:15:4 | y |
4749
| Test.java:15:4:15:9 | SSA def(y) | Test.java:20:14:20:14 | y |
48-
| Test.java:19:3:19:3 | SSA phi(x) | Test.java:20:10:20:10 | x |
49-
| Test.java:19:3:19:3 | SSA phi(y) | Test.java:20:14:20:14 | y |
50-
| Test.java:20:10:20:10 | SSA phi(param) | Test.java:21:8:21:12 | param |
51-
| Test.java:20:10:20:10 | SSA phi(y) | Test.java:20:14:20:14 | y |
50+
| Test.java:20:3:20:15 | SSA phi(param) | Test.java:21:8:21:12 | param |
51+
| Test.java:20:3:20:15 | SSA phi(y) | Test.java:20:14:20:14 | y |
5252
| Test.java:21:8:21:14 | SSA def(param) | Test.java:21:8:21:12 | param |
5353
| Test.java:24:4:24:9 | SSA def(y) | Test.java:20:14:20:14 | y |
5454
| Test.java:27:12:27:16 | SSA def(i) | Test.java:27:19:27:19 | i |
55-
| Test.java:27:19:27:19 | SSA phi(i) | Test.java:27:19:27:19 | i |
56-
| Test.java:27:19:27:19 | SSA phi(x) | Test.java:28:4:28:4 | x |
57-
| Test.java:27:19:27:19 | SSA phi(x) | Test.java:31:10:31:10 | x |
55+
| Test.java:27:19:27:22 | SSA phi(i) | Test.java:27:19:27:19 | i |
56+
| Test.java:27:19:27:22 | SSA phi(x) | Test.java:28:4:28:4 | x |
57+
| Test.java:27:19:27:22 | SSA phi(x) | Test.java:31:10:31:10 | x |
5858
| Test.java:27:25:27:27 | SSA def(i) | Test.java:27:19:27:19 | i |
5959
| Test.java:28:4:28:9 | SSA def(x) | Test.java:28:4:28:4 | x |
6060
| Test.java:28:4:28:9 | SSA def(x) | Test.java:31:10:31:10 | x |
61-
| TestInstanceOfPattern.java:3:24:9:2 | SSA param(obj) | TestInstanceOfPattern.java:4:7:4:9 | obj |
61+
| TestInstanceOfPattern.java:3:7:3:10 | SSA param(obj) | TestInstanceOfPattern.java:4:7:4:9 | obj |
6262
| TestInstanceOfPattern.java:4:29:4:29 | SSA def(s) | TestInstanceOfPattern.java:5:8:5:8 | s |
63-
| TestInstanceOfPattern.java:10:25:16:2 | SSA param(obj) | TestInstanceOfPattern.java:11:9:11:11 | obj |
63+
| TestInstanceOfPattern.java:10:7:10:11 | SSA param(obj) | TestInstanceOfPattern.java:11:9:11:11 | obj |
6464
| TestInstanceOfPattern.java:11:31:11:31 | SSA def(s) | TestInstanceOfPattern.java:14:8:14:8 | s |
65-
| TestInstanceOfPattern.java:17:25:23:2 | SSA param(obj) | TestInstanceOfPattern.java:18:7:18:9 | obj |
65+
| TestInstanceOfPattern.java:17:7:17:11 | SSA param(obj) | TestInstanceOfPattern.java:18:7:18:9 | obj |
6666
| TestInstanceOfPattern.java:18:29:18:29 | SSA def(s) | TestInstanceOfPattern.java:18:34:18:34 | s |
67-
| TestInstanceOfPattern.java:24:25:30:2 | SSA entry def(this.s) | TestInstanceOfPattern.java:25:34:25:34 | s |
68-
| TestInstanceOfPattern.java:24:25:30:2 | SSA entry def(this.s) | TestInstanceOfPattern.java:26:8:26:8 | s |
69-
| TestInstanceOfPattern.java:24:25:30:2 | SSA param(obj) | TestInstanceOfPattern.java:25:7:25:9 | obj |
67+
| TestInstanceOfPattern.java:24:7:24:11 | SSA entry def(this.s) | TestInstanceOfPattern.java:25:34:25:34 | s |
68+
| TestInstanceOfPattern.java:24:7:24:11 | SSA entry def(this.s) | TestInstanceOfPattern.java:26:8:26:8 | s |
69+
| TestInstanceOfPattern.java:24:7:24:11 | SSA param(obj) | TestInstanceOfPattern.java:25:7:25:9 | obj |

0 commit comments

Comments
 (0)