Skip to content

Commit 2cf714a

Browse files
committed
C++: Follow changes in lambda locations
1 parent 8e00516 commit 2cf714a

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,29 +178,31 @@
178178
| taint.cpp:213:15:213:15 | ref arg y | taint.cpp:216:7:216:7 | y | |
179179
| taint.cpp:213:15:213:15 | y | taint.cpp:213:12:213:12 | ref arg x | |
180180
| taint.cpp:223:10:223:15 | call to source | taint.cpp:228:12:228:12 | t | |
181-
| taint.cpp:223:10:223:15 | call to source | taint.cpp:235:11:239:2 | t | |
182-
| taint.cpp:223:10:223:15 | call to source | taint.cpp:243:11:246:2 | t | |
181+
| taint.cpp:223:10:223:15 | call to source | taint.cpp:235:10:239:2 | t | |
182+
| taint.cpp:223:10:223:15 | call to source | taint.cpp:243:10:246:2 | t | |
183183
| taint.cpp:223:10:223:15 | call to source | taint.cpp:253:4:253:4 | t | |
184184
| taint.cpp:223:10:223:15 | call to source | taint.cpp:260:4:260:4 | t | |
185185
| taint.cpp:224:9:224:10 | 0 | taint.cpp:228:15:228:15 | u | |
186-
| taint.cpp:224:9:224:10 | 0 | taint.cpp:235:11:239:2 | u | |
187-
| taint.cpp:224:9:224:10 | 0 | taint.cpp:243:11:246:2 | u | |
186+
| taint.cpp:224:9:224:10 | 0 | taint.cpp:235:10:239:2 | u | |
187+
| taint.cpp:224:9:224:10 | 0 | taint.cpp:243:10:246:2 | u | |
188188
| taint.cpp:224:9:224:10 | 0 | taint.cpp:253:7:253:7 | u | |
189189
| taint.cpp:224:9:224:10 | 0 | taint.cpp:260:7:260:7 | u | |
190-
| taint.cpp:225:9:225:10 | 0 | taint.cpp:235:11:239:2 | v | |
190+
| taint.cpp:225:9:225:10 | 0 | taint.cpp:235:10:239:2 | v | |
191191
| taint.cpp:225:9:225:10 | 0 | taint.cpp:241:7:241:7 | v | |
192192
| taint.cpp:226:9:226:10 | 0 | taint.cpp:260:10:260:10 | w | |
193193
| taint.cpp:226:9:226:10 | 0 | taint.cpp:261:7:261:7 | w | |
194+
| taint.cpp:228:10:232:2 | [...](...){...} | taint.cpp:233:7:233:7 | a | |
195+
| taint.cpp:228:10:232:2 | {...} | taint.cpp:228:10:232:2 | [...](...){...} | |
194196
| taint.cpp:228:11:228:11 | Unknown literal | taint.cpp:228:11:228:11 | constructor init of field t | TAINT |
195197
| taint.cpp:228:11:228:11 | Unknown literal | taint.cpp:228:11:228:11 | constructor init of field u | TAINT |
196198
| taint.cpp:228:11:228:11 | `this` parameter in (constructor) | taint.cpp:228:11:228:11 | constructor init of field t [pre-this] | |
197199
| taint.cpp:228:11:228:11 | constructor init of field t [post-this] | taint.cpp:228:11:228:11 | constructor init of field u [pre-this] | |
198200
| taint.cpp:228:11:228:11 | constructor init of field t [pre-this] | taint.cpp:228:11:228:11 | constructor init of field u [pre-this] | |
199-
| taint.cpp:228:11:232:2 | [...](...){...} | taint.cpp:233:7:233:7 | a | |
200-
| taint.cpp:228:11:232:2 | {...} | taint.cpp:228:11:232:2 | [...](...){...} | |
201201
| taint.cpp:228:17:228:17 | `this` parameter in operator() | taint.cpp:229:3:229:6 | this | |
202202
| taint.cpp:229:3:229:6 | this | taint.cpp:230:3:230:6 | this | |
203203
| taint.cpp:230:3:230:6 | this | taint.cpp:231:3:231:11 | this | |
204+
| taint.cpp:235:10:239:2 | [...](...){...} | taint.cpp:240:2:240:2 | b | |
205+
| taint.cpp:235:10:239:2 | {...} | taint.cpp:235:10:239:2 | [...](...){...} | |
204206
| taint.cpp:235:11:235:11 | Unknown literal | taint.cpp:235:11:235:11 | constructor init of field t | TAINT |
205207
| taint.cpp:235:11:235:11 | Unknown literal | taint.cpp:235:11:235:11 | constructor init of field u | TAINT |
206208
| taint.cpp:235:11:235:11 | Unknown literal | taint.cpp:235:11:235:11 | constructor init of field v | TAINT |
@@ -209,19 +211,17 @@
209211
| taint.cpp:235:11:235:11 | constructor init of field t [pre-this] | taint.cpp:235:11:235:11 | constructor init of field u [pre-this] | |
210212
| taint.cpp:235:11:235:11 | constructor init of field u [post-this] | taint.cpp:235:11:235:11 | constructor init of field v [pre-this] | |
211213
| taint.cpp:235:11:235:11 | constructor init of field u [pre-this] | taint.cpp:235:11:235:11 | constructor init of field v [pre-this] | |
212-
| taint.cpp:235:11:239:2 | [...](...){...} | taint.cpp:240:2:240:2 | b | |
213-
| taint.cpp:235:11:239:2 | {...} | taint.cpp:235:11:239:2 | [...](...){...} | |
214214
| taint.cpp:235:15:235:15 | `this` parameter in operator() | taint.cpp:236:3:236:6 | this | |
215215
| taint.cpp:236:3:236:6 | this | taint.cpp:237:3:237:6 | this | |
216216
| taint.cpp:237:3:237:6 | this | taint.cpp:238:3:238:14 | this | |
217217
| taint.cpp:238:7:238:12 | call to source | taint.cpp:238:3:238:14 | ... = ... | |
218+
| taint.cpp:243:10:246:2 | [...](...){...} | taint.cpp:247:2:247:2 | c | |
219+
| taint.cpp:243:10:246:2 | {...} | taint.cpp:243:10:246:2 | [...](...){...} | |
218220
| taint.cpp:243:11:243:11 | Unknown literal | taint.cpp:243:11:243:11 | constructor init of field t | TAINT |
219221
| taint.cpp:243:11:243:11 | Unknown literal | taint.cpp:243:11:243:11 | constructor init of field u | TAINT |
220222
| taint.cpp:243:11:243:11 | `this` parameter in (constructor) | taint.cpp:243:11:243:11 | constructor init of field t [pre-this] | |
221223
| taint.cpp:243:11:243:11 | constructor init of field t [post-this] | taint.cpp:243:11:243:11 | constructor init of field u [pre-this] | |
222224
| taint.cpp:243:11:243:11 | constructor init of field t [pre-this] | taint.cpp:243:11:243:11 | constructor init of field u [pre-this] | |
223-
| taint.cpp:243:11:246:2 | [...](...){...} | taint.cpp:247:2:247:2 | c | |
224-
| taint.cpp:243:11:246:2 | {...} | taint.cpp:243:11:246:2 | [...](...){...} | |
225225
| taint.cpp:243:15:243:15 | `this` parameter in operator() | taint.cpp:244:3:244:6 | this | |
226226
| taint.cpp:244:3:244:6 | this | taint.cpp:245:3:245:6 | this | |
227227
| taint.cpp:249:11:252:2 | [...](...){...} | taint.cpp:253:2:253:2 | d | |

cpp/ql/test/library-tests/defuse/definition.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| addressOf.cpp:31:23:31:23 | i | addressOf.cpp:38:20:38:25 | ... += ... |
1212
| addressOf.cpp:40:8:40:11 | iref | addressOf.cpp:40:15:40:15 | i |
1313
| addressOf.cpp:40:8:40:11 | iref | addressOf.cpp:42:18:42:22 | & ... |
14-
| addressOf.cpp:47:8:47:9 | f1 | addressOf.cpp:47:13:47:31 | [...](...){...} |
15-
| addressOf.cpp:49:8:49:9 | f2 | addressOf.cpp:49:13:49:39 | [...](...){...} |
14+
| addressOf.cpp:47:8:47:9 | f1 | addressOf.cpp:47:12:47:31 | [...](...){...} |
15+
| addressOf.cpp:49:8:49:9 | f2 | addressOf.cpp:49:12:49:39 | [...](...){...} |
1616
| addressOf.cpp:56:7:56:7 | a | addressOf.cpp:56:13:56:28 | {...} |
1717
| addressOf.cpp:56:7:56:7 | a | addressOf.cpp:57:18:57:45 | ... + ... |
1818
| addressOf.cpp:56:7:56:7 | a | addressOf.cpp:58:18:58:18 | a |

cpp/ql/test/library-tests/defuse/definitionUsePair.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
| addressOf.cpp:31:23:31:23 | i | addressOf.cpp:37:18:37:26 | & ... | addressOf.cpp:38:20:38:20 | i |
99
| addressOf.cpp:31:23:31:23 | i | addressOf.cpp:38:18:38:30 | ... + ... | addressOf.cpp:40:15:40:15 | i |
1010
| addressOf.cpp:40:8:40:11 | iref | addressOf.cpp:40:15:40:15 | i | addressOf.cpp:42:19:42:22 | iref |
11-
| addressOf.cpp:47:8:47:9 | f1 | addressOf.cpp:47:13:47:31 | [...](...){...} | addressOf.cpp:48:3:48:4 | f1 |
12-
| addressOf.cpp:49:8:49:9 | f2 | addressOf.cpp:49:13:49:39 | [...](...){...} | addressOf.cpp:50:3:50:4 | f2 |
11+
| addressOf.cpp:47:8:47:9 | f1 | addressOf.cpp:47:12:47:31 | [...](...){...} | addressOf.cpp:48:3:48:4 | f1 |
12+
| addressOf.cpp:49:8:49:9 | f2 | addressOf.cpp:49:12:49:39 | [...](...){...} | addressOf.cpp:50:3:50:4 | f2 |
1313
| addressOf.cpp:56:7:56:7 | a | addressOf.cpp:56:13:56:28 | {...} | addressOf.cpp:57:19:57:19 | a |
1414
| addressOf.cpp:56:7:56:7 | a | addressOf.cpp:57:18:57:45 | ... + ... | addressOf.cpp:58:18:58:18 | a |
1515
| indirect_use.cpp:20:10:20:10 | p | indirect_use.cpp:20:14:20:15 | ip | indirect_use.cpp:21:17:21:17 | p |

cpp/ql/test/library-tests/defuse/exprDefinition.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| addressOf.cpp:47:8:47:9 | f1 | addressOf.cpp:47:13:47:31 | [...](...){...} | addressOf.cpp:47:13:47:31 | [...](...){...} |
2-
| addressOf.cpp:49:8:49:9 | f2 | addressOf.cpp:49:13:49:39 | [...](...){...} | addressOf.cpp:49:13:49:39 | [...](...){...} |
1+
| addressOf.cpp:47:8:47:9 | f1 | addressOf.cpp:47:12:47:31 | [...](...){...} | addressOf.cpp:47:12:47:31 | [...](...){...} |
2+
| addressOf.cpp:49:8:49:9 | f2 | addressOf.cpp:49:12:49:39 | [...](...){...} | addressOf.cpp:49:12:49:39 | [...](...){...} |
33
| addressOf.cpp:56:7:56:7 | a | addressOf.cpp:56:13:56:28 | {...} | addressOf.cpp:56:13:56:28 | {...} |
44
| indirect_use.cpp:20:10:20:10 | p | indirect_use.cpp:20:14:20:15 | ip | indirect_use.cpp:20:14:20:15 | ip |
55
| indirect_use.cpp:25:10:25:10 | p | indirect_use.cpp:25:14:25:19 | ... + ... | indirect_use.cpp:25:14:25:19 | ... + ... |

cpp/ql/test/library-tests/lambdas/captures/elements.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@
108108
| captures.cpp:22:3:24:4 | declaration |
109109
| captures.cpp:22:8:22:15 | definition of myLambda |
110110
| captures.cpp:22:8:22:15 | myLambda |
111+
| captures.cpp:22:18:24:3 | [...](...){...} |
111112
| captures.cpp:22:18:24:3 | initializer for myLambda |
113+
| captures.cpp:22:18:24:3 | {...} |
112114
| captures.cpp:22:19:22:19 | (constructor) |
113115
| captures.cpp:22:19:22:19 | (constructor) |
114116
| captures.cpp:22:19:22:19 | (constructor) |
@@ -123,8 +125,6 @@
123125
| captures.cpp:22:19:22:19 | operator= |
124126
| captures.cpp:22:19:22:19 | return ... |
125127
| captures.cpp:22:19:22:19 | { ... } |
126-
| captures.cpp:22:19:24:3 | [...](...){...} |
127-
| captures.cpp:22:19:24:3 | {...} |
128128
| captures.cpp:22:23:22:23 | definition of x |
129129
| captures.cpp:22:23:22:23 | x |
130130
| captures.cpp:22:23:22:23 | x |
@@ -164,7 +164,9 @@
164164
| end_pos.cpp:9:5:11:6 | declaration |
165165
| end_pos.cpp:9:10:9:11 | definition of fp |
166166
| end_pos.cpp:9:10:9:11 | fp |
167+
| end_pos.cpp:9:14:11:5 | [...](...){...} |
167168
| end_pos.cpp:9:14:11:5 | initializer for fp |
169+
| end_pos.cpp:9:14:11:5 | {...} |
168170
| end_pos.cpp:9:15:9:15 | (constructor) |
169171
| end_pos.cpp:9:15:9:15 | (constructor) |
170172
| end_pos.cpp:9:15:9:15 | (constructor) |
@@ -177,8 +179,6 @@
177179
| end_pos.cpp:9:15:9:15 | operator= |
178180
| end_pos.cpp:9:15:9:15 | return ... |
179181
| end_pos.cpp:9:15:9:15 | { ... } |
180-
| end_pos.cpp:9:15:11:5 | [...](...){...} |
181-
| end_pos.cpp:9:15:11:5 | {...} |
182182
| end_pos.cpp:9:17:9:17 | definition of ii |
183183
| end_pos.cpp:9:17:9:17 | ii |
184184
| end_pos.cpp:9:17:9:18 | (reference to) |

0 commit comments

Comments
 (0)