Skip to content

Commit bb54aa0

Browse files
committed
C#: Accept test changes.
1 parent cb62155 commit bb54aa0

12 files changed

Lines changed: 599 additions & 563 deletions

csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,37 @@
2121
| CSharp7.cs:23:5:23:27 | this access | CSharp7.cs:23:39:23:43 | this access |
2222
| CSharp7.cs:24:6:24:28 | this | CSharp7.cs:24:35:24:39 | this access |
2323
| CSharp7.cs:27:7:27:15 | this | CSharp7.cs:27:7:27:15 | this access |
24-
| CSharp7.cs:29:19:29:19 | SSA param(i) | CSharp7.cs:31:16:31:16 | access to parameter i |
25-
| CSharp7.cs:29:19:29:19 | i | CSharp7.cs:29:19:29:19 | SSA param(i) |
24+
| CSharp7.cs:29:9:29:13 | SSA param(i) | CSharp7.cs:31:16:31:16 | access to parameter i |
25+
| CSharp7.cs:29:19:29:19 | i | CSharp7.cs:29:9:29:13 | SSA param(i) |
2626
| CSharp7.cs:31:16:31:16 | access to parameter i | CSharp7.cs:31:16:31:20 | ... > ... |
2727
| CSharp7.cs:31:16:31:16 | access to parameter i | CSharp7.cs:31:24:31:24 | access to parameter i |
2828
| CSharp7.cs:31:24:31:24 | access to parameter i | CSharp7.cs:31:16:31:59 | ... ? ... : ... |
2929
| CSharp7.cs:31:28:31:59 | throw ... | CSharp7.cs:31:16:31:59 | ... ? ... : ... |
3030
| CSharp7.cs:35:7:35:18 | this | CSharp7.cs:35:7:35:18 | this access |
3131
| CSharp7.cs:39:9:39:9 | access to parameter x | CSharp7.cs:39:9:39:21 | SSA def(x) |
3232
| CSharp7.cs:39:13:39:21 | "tainted" | CSharp7.cs:39:9:39:9 | access to parameter x |
33-
| CSharp7.cs:42:19:42:19 | SSA param(x) | CSharp7.cs:44:13:44:13 | access to parameter x |
34-
| CSharp7.cs:42:19:42:19 | x | CSharp7.cs:42:19:42:19 | SSA param(x) |
33+
| CSharp7.cs:42:10:42:10 | SSA param(x) | CSharp7.cs:44:13:44:13 | access to parameter x |
34+
| CSharp7.cs:42:19:42:19 | x | CSharp7.cs:42:10:42:10 | SSA param(x) |
3535
| CSharp7.cs:44:9:44:9 | access to parameter y | CSharp7.cs:44:9:44:13 | SSA def(y) |
3636
| CSharp7.cs:44:13:44:13 | access to parameter x | CSharp7.cs:44:9:44:9 | access to parameter y |
3737
| CSharp7.cs:47:10:47:10 | this | CSharp7.cs:49:9:49:24 | this access |
38+
| CSharp7.cs:49:9:49:24 | SSA def(t1) | CSharp7.cs:51:18:51:19 | access to local variable t1 |
3839
| CSharp7.cs:49:9:49:24 | [post] this access | CSharp7.cs:50:9:50:21 | this access |
3940
| CSharp7.cs:49:9:49:24 | this access | CSharp7.cs:50:9:50:21 | this access |
40-
| CSharp7.cs:49:22:49:23 | SSA def(t1) | CSharp7.cs:51:18:51:19 | access to local variable t1 |
41-
| CSharp7.cs:49:22:49:23 | String t1 | CSharp7.cs:49:22:49:23 | SSA def(t1) |
41+
| CSharp7.cs:49:22:49:23 | String t1 | CSharp7.cs:49:9:49:24 | SSA def(t1) |
42+
| CSharp7.cs:50:9:50:21 | SSA def(t2) | CSharp7.cs:54:14:54:15 | access to local variable t2 |
4243
| CSharp7.cs:50:9:50:21 | [post] this access | CSharp7.cs:52:9:52:17 | this access |
4344
| CSharp7.cs:50:9:50:21 | this access | CSharp7.cs:52:9:52:17 | this access |
44-
| CSharp7.cs:50:19:50:20 | SSA def(t2) | CSharp7.cs:54:14:54:15 | access to local variable t2 |
45-
| CSharp7.cs:50:19:50:20 | String t2 | CSharp7.cs:50:19:50:20 | SSA def(t2) |
45+
| CSharp7.cs:50:19:50:20 | String t2 | CSharp7.cs:50:9:50:21 | SSA def(t2) |
4646
| CSharp7.cs:51:18:51:19 | access to local variable t1 | CSharp7.cs:51:13:51:14 | access to local variable t3 |
47+
| CSharp7.cs:52:9:52:17 | SSA def(t1) | CSharp7.cs:53:14:53:15 | access to local variable t1 |
4748
| CSharp7.cs:52:9:52:17 | [post] this access | CSharp7.cs:55:9:55:32 | this access |
4849
| CSharp7.cs:52:9:52:17 | this access | CSharp7.cs:55:9:55:32 | this access |
49-
| CSharp7.cs:52:15:52:16 | SSA def(t1) | CSharp7.cs:53:14:53:15 | access to local variable t1 |
50-
| CSharp7.cs:52:15:52:16 | access to local variable t1 | CSharp7.cs:52:15:52:16 | SSA def(t1) |
50+
| CSharp7.cs:52:15:52:16 | access to local variable t1 | CSharp7.cs:52:9:52:17 | SSA def(t1) |
5151
| CSharp7.cs:53:14:53:15 | access to local variable t1 | CSharp7.cs:53:9:53:10 | access to local variable t3 |
5252
| CSharp7.cs:54:14:54:15 | access to local variable t2 | CSharp7.cs:54:9:54:10 | access to local variable t3 |
53-
| CSharp7.cs:55:30:55:31 | SSA def(t4) | CSharp7.cs:56:18:56:19 | access to local variable t4 |
54-
| CSharp7.cs:55:30:55:31 | String t4 | CSharp7.cs:55:30:55:31 | SSA def(t4) |
53+
| CSharp7.cs:55:9:55:32 | SSA def(t4) | CSharp7.cs:56:18:56:19 | access to local variable t4 |
54+
| CSharp7.cs:55:30:55:31 | String t4 | CSharp7.cs:55:9:55:32 | SSA def(t4) |
5555
| CSharp7.cs:56:18:56:19 | access to local variable t4 | CSharp7.cs:56:13:56:14 | access to local variable t5 |
5656
| CSharp7.cs:60:7:60:12 | this | CSharp7.cs:60:7:60:12 | this access |
5757
| CSharp7.cs:67:10:67:20 | this | CSharp7.cs:69:26:69:28 | this access |
@@ -95,8 +95,8 @@
9595
| CSharp7.cs:77:22:77:28 | (..., ...) | CSharp7.cs:77:9:77:18 | (..., ...) |
9696
| CSharp7.cs:77:23:77:24 | "" | CSharp7.cs:77:9:77:28 | ... = ... |
9797
| CSharp7.cs:77:27:77:27 | access to local variable x | CSharp7.cs:77:9:77:28 | ... = ... |
98-
| CSharp7.cs:80:21:80:21 | SSA param(x) | CSharp7.cs:82:20:82:20 | access to parameter x |
99-
| CSharp7.cs:80:21:80:21 | x | CSharp7.cs:80:21:80:21 | SSA param(x) |
98+
| CSharp7.cs:80:12:80:12 | SSA param(x) | CSharp7.cs:82:20:82:20 | access to parameter x |
99+
| CSharp7.cs:80:21:80:21 | x | CSharp7.cs:80:12:80:12 | SSA param(x) |
100100
| CSharp7.cs:85:10:85:18 | this | CSharp7.cs:90:18:90:28 | this access |
101101
| CSharp7.cs:87:13:87:14 | access to local variable t1 | CSharp7.cs:87:13:87:34 | SSA def(t1) |
102102
| CSharp7.cs:87:13:87:34 | SSA def(t1) | CSharp7.cs:88:28:88:29 | access to local variable t1 |
@@ -144,51 +144,51 @@
144144
| CSharp7.cs:121:28:121:36 | "DefUse3" | CSharp7.cs:121:22:121:36 | ... = ... |
145145
| CSharp7.cs:125:7:125:20 | this | CSharp7.cs:125:7:125:20 | this access |
146146
| CSharp7.cs:127:9:127:12 | this | CSharp7.cs:133:24:133:25 | this access |
147-
| CSharp7.cs:129:20:129:20 | SSA param(x) | CSharp7.cs:129:32:129:32 | access to parameter x |
148-
| CSharp7.cs:129:20:129:20 | x | CSharp7.cs:129:20:129:20 | SSA param(x) |
147+
| CSharp7.cs:129:9:129:39 | SSA param(x) | CSharp7.cs:129:32:129:32 | access to parameter x |
148+
| CSharp7.cs:129:20:129:20 | x | CSharp7.cs:129:9:129:39 | SSA param(x) |
149149
| CSharp7.cs:129:32:129:32 | access to parameter x | CSharp7.cs:129:32:129:36 | ... + ... |
150150
| CSharp7.cs:129:36:129:36 | 1 | CSharp7.cs:129:32:129:36 | ... + ... |
151-
| CSharp7.cs:131:22:131:22 | SSA param(t) | CSharp7.cs:131:39:131:39 | access to parameter t |
152-
| CSharp7.cs:131:22:131:22 | t | CSharp7.cs:131:22:131:22 | SSA param(t) |
151+
| CSharp7.cs:131:9:131:42 | SSA param(t) | CSharp7.cs:131:39:131:39 | access to parameter t |
152+
| CSharp7.cs:131:22:131:22 | t | CSharp7.cs:131:9:131:42 | SSA param(t) |
153153
| CSharp7.cs:133:24:133:25 | delegate creation of type Func<Int32> | CSharp7.cs:133:19:133:20 | access to local variable f4 |
154154
| CSharp7.cs:133:24:133:25 | this access | CSharp7.cs:154:16:154:17 | this access |
155-
| CSharp7.cs:137:29:137:29 | SSA param(x) | CSharp7.cs:137:34:137:34 | access to parameter x |
156-
| CSharp7.cs:137:29:137:29 | x | CSharp7.cs:137:29:137:29 | SSA param(x) |
155+
| CSharp7.cs:137:29:137:29 | x | CSharp7.cs:137:29:137:38 | SSA param(x) |
157156
| CSharp7.cs:137:29:137:38 | (...) => ... | CSharp7.cs:137:24:137:25 | access to local variable f5 |
157+
| CSharp7.cs:137:29:137:38 | SSA param(x) | CSharp7.cs:137:34:137:34 | access to parameter x |
158158
| CSharp7.cs:137:34:137:34 | access to parameter x | CSharp7.cs:137:34:137:38 | ... + ... |
159159
| CSharp7.cs:137:38:137:38 | 1 | CSharp7.cs:137:34:137:38 | ... + ... |
160-
| CSharp7.cs:139:20:139:20 | SSA param(x) | CSharp7.cs:139:26:139:26 | access to parameter x |
161-
| CSharp7.cs:139:20:139:20 | x | CSharp7.cs:139:20:139:20 | SSA param(x) |
160+
| CSharp7.cs:139:9:139:51 | SSA param(x) | CSharp7.cs:139:26:139:26 | access to parameter x |
161+
| CSharp7.cs:139:20:139:20 | x | CSharp7.cs:139:9:139:51 | SSA param(x) |
162162
| CSharp7.cs:139:26:139:26 | access to parameter x | CSharp7.cs:139:26:139:30 | ... > ... |
163163
| CSharp7.cs:139:26:139:26 | access to parameter x | CSharp7.cs:139:41:139:41 | access to parameter x |
164164
| CSharp7.cs:139:34:139:34 | 1 | CSharp7.cs:139:34:139:46 | ... + ... |
165165
| CSharp7.cs:139:34:139:46 | ... + ... | CSharp7.cs:139:26:139:50 | ... ? ... : ... |
166166
| CSharp7.cs:139:38:139:46 | call to local function f7 | CSharp7.cs:139:34:139:46 | ... + ... |
167167
| CSharp7.cs:139:50:139:50 | 0 | CSharp7.cs:139:26:139:50 | ... ? ... : ... |
168-
| CSharp7.cs:141:20:141:20 | SSA param(x) | CSharp7.cs:141:29:141:29 | access to parameter x |
169-
| CSharp7.cs:141:20:141:20 | x | CSharp7.cs:141:20:141:20 | SSA param(x) |
170-
| CSharp7.cs:145:24:145:24 | SSA param(x) | CSharp7.cs:145:33:145:33 | access to parameter x |
171-
| CSharp7.cs:145:24:145:24 | x | CSharp7.cs:145:24:145:24 | SSA param(x) |
168+
| CSharp7.cs:141:9:141:31 | SSA param(x) | CSharp7.cs:141:29:141:29 | access to parameter x |
169+
| CSharp7.cs:141:20:141:20 | x | CSharp7.cs:141:9:141:31 | SSA param(x) |
170+
| CSharp7.cs:145:13:145:35 | SSA param(x) | CSharp7.cs:145:33:145:33 | access to parameter x |
171+
| CSharp7.cs:145:24:145:24 | x | CSharp7.cs:145:13:145:35 | SSA param(x) |
172172
| CSharp7.cs:149:20:152:9 | (...) => ... | CSharp7.cs:149:16:149:16 | access to local variable a |
173173
| CSharp7.cs:157:10:157:17 | this | CSharp7.cs:169:9:169:9 | this access |
174-
| CSharp7.cs:160:18:160:18 | SSA param(t) | CSharp7.cs:160:24:160:24 | access to parameter t |
175-
| CSharp7.cs:160:18:160:18 | t | CSharp7.cs:160:18:160:18 | SSA param(t) |
176-
| CSharp7.cs:162:26:162:26 | SSA param(u) | CSharp7.cs:166:22:166:22 | access to parameter u |
177-
| CSharp7.cs:162:26:162:26 | u | CSharp7.cs:162:26:162:26 | SSA param(u) |
174+
| CSharp7.cs:160:9:160:25 | SSA param(t) | CSharp7.cs:160:24:160:24 | access to parameter t |
175+
| CSharp7.cs:160:18:160:18 | t | CSharp7.cs:160:9:160:25 | SSA param(t) |
176+
| CSharp7.cs:162:9:167:9 | SSA param(u) | CSharp7.cs:166:22:166:22 | access to parameter u |
177+
| CSharp7.cs:162:26:162:26 | u | CSharp7.cs:162:9:167:9 | SSA param(u) |
178178
| CSharp7.cs:165:13:165:16 | this access | CSharp7.cs:166:20:166:20 | this access |
179179
| CSharp7.cs:169:9:169:9 | this access | CSharp7.cs:170:9:170:9 | this access |
180180
| CSharp7.cs:173:10:173:19 | this | CSharp7.cs:180:21:180:21 | this access |
181181
| CSharp7.cs:175:16:175:18 | access to local variable src | CSharp7.cs:175:16:175:30 | SSA def(src) |
182182
| CSharp7.cs:175:16:175:30 | SSA def(src) | CSharp7.cs:180:23:180:25 | access to local variable src |
183183
| CSharp7.cs:175:22:175:30 | "tainted" | CSharp7.cs:175:16:175:18 | access to local variable src |
184-
| CSharp7.cs:176:25:176:25 | SSA param(s) | CSharp7.cs:176:33:176:33 | access to parameter s |
185-
| CSharp7.cs:176:25:176:25 | s | CSharp7.cs:176:25:176:25 | SSA param(s) |
184+
| CSharp7.cs:176:9:176:40 | SSA param(s) | CSharp7.cs:176:33:176:33 | access to parameter s |
185+
| CSharp7.cs:176:25:176:25 | s | CSharp7.cs:176:9:176:40 | SSA param(s) |
186186
| CSharp7.cs:176:31:176:34 | call to local function g | CSharp7.cs:176:31:176:39 | ... + ... |
187187
| CSharp7.cs:176:38:176:39 | "" | CSharp7.cs:176:31:176:39 | ... + ... |
188-
| CSharp7.cs:177:25:177:25 | SSA param(s) | CSharp7.cs:177:31:177:31 | access to parameter s |
189-
| CSharp7.cs:177:25:177:25 | s | CSharp7.cs:177:25:177:25 | SSA param(s) |
190-
| CSharp7.cs:178:25:178:25 | SSA param(s) | CSharp7.cs:178:37:178:37 | access to parameter s |
191-
| CSharp7.cs:178:25:178:25 | s | CSharp7.cs:178:25:178:25 | SSA param(s) |
188+
| CSharp7.cs:177:9:177:32 | SSA param(s) | CSharp7.cs:177:31:177:31 | access to parameter s |
189+
| CSharp7.cs:177:25:177:25 | s | CSharp7.cs:177:9:177:32 | SSA param(s) |
190+
| CSharp7.cs:178:9:178:40 | SSA param(s) | CSharp7.cs:178:37:178:37 | access to parameter s |
191+
| CSharp7.cs:178:25:178:25 | s | CSharp7.cs:178:9:178:40 | SSA param(s) |
192192
| CSharp7.cs:180:21:180:21 | this access | CSharp7.cs:181:21:181:21 | this access |
193193
| CSharp7.cs:180:21:180:26 | call to local function f | CSharp7.cs:180:13:180:17 | access to local variable sink1 |
194194
| CSharp7.cs:180:23:180:25 | [post] access to local variable src | CSharp7.cs:181:23:181:25 | access to local variable src |
@@ -228,10 +228,10 @@
228228
| CSharp7.cs:198:26:198:35 | this access | CSharp7.cs:199:9:199:18 | this access |
229229
| CSharp7.cs:198:33:198:34 | access to local variable r1 | CSharp7.cs:199:16:199:17 | access to local variable r1 |
230230
| CSharp7.cs:199:22:199:22 | 3 | CSharp7.cs:199:9:199:22 | ... = ... |
231-
| CSharp7.cs:202:24:202:24 | SSA param(p) | CSharp7.cs:205:20:205:20 | access to parameter p |
232-
| CSharp7.cs:202:24:202:24 | p | CSharp7.cs:202:24:202:24 | SSA param(p) |
233-
| CSharp7.cs:204:28:204:28 | SSA param(q) | CSharp7.cs:204:44:204:44 | access to parameter q |
234-
| CSharp7.cs:204:28:204:28 | q | CSharp7.cs:204:28:204:28 | SSA param(q) |
231+
| CSharp7.cs:202:13:202:14 | SSA param(p) | CSharp7.cs:205:20:205:20 | access to parameter p |
232+
| CSharp7.cs:202:24:202:24 | p | CSharp7.cs:202:13:202:14 | SSA param(p) |
233+
| CSharp7.cs:204:9:204:47 | SSA param(q) | CSharp7.cs:204:44:204:44 | access to parameter q |
234+
| CSharp7.cs:204:28:204:28 | q | CSharp7.cs:204:9:204:47 | SSA param(q) |
235235
| CSharp7.cs:211:7:211:14 | this | CSharp7.cs:211:7:211:14 | this access |
236236
| CSharp7.cs:215:9:215:9 | access to parameter x | CSharp7.cs:215:9:215:17 | SSA def(x) |
237237
| CSharp7.cs:215:13:215:17 | false | CSharp7.cs:215:9:215:9 | access to parameter x |
@@ -314,8 +314,8 @@
314314
| CSharp7.cs:283:13:283:16 | access to local variable list | CSharp7.cs:283:13:283:62 | SSA def(list) |
315315
| CSharp7.cs:283:13:283:62 | SSA def(list) | CSharp7.cs:285:39:285:42 | access to local variable list |
316316
| CSharp7.cs:283:20:283:62 | call to method Select<KeyValuePair<Int32,String>,(Int32,String)> | CSharp7.cs:283:13:283:16 | access to local variable list |
317-
| CSharp7.cs:283:32:283:35 | SSA param(item) | CSharp7.cs:283:41:283:44 | access to parameter item |
318-
| CSharp7.cs:283:32:283:35 | item | CSharp7.cs:283:32:283:35 | SSA param(item) |
317+
| CSharp7.cs:283:32:283:35 | item | CSharp7.cs:283:32:283:61 | SSA param(item) |
318+
| CSharp7.cs:283:32:283:61 | SSA param(item) | CSharp7.cs:283:41:283:44 | access to parameter item |
319319
| CSharp7.cs:283:41:283:44 | [post] access to parameter item | CSharp7.cs:283:51:283:54 | access to parameter item |
320320
| CSharp7.cs:283:41:283:44 | access to parameter item | CSharp7.cs:283:41:283:48 | access to property Key |
321321
| CSharp7.cs:283:41:283:44 | access to parameter item | CSharp7.cs:283:51:283:54 | access to parameter item |

0 commit comments

Comments
 (0)