Skip to content

Commit d38dbf0

Browse files
jbjjbj
committed
C++: Workaround for lambda expression locations
See CPP-427.
1 parent ae2a68b commit d38dbf0

File tree

7 files changed

+58
-33
lines changed

7 files changed

+58
-33
lines changed

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,33 @@ class ExprNode extends Node, TExprNode {
106106

107107
override string toString() { result = expr.toString() }
108108

109-
override Location getLocation() { result = expr.getLocation() }
109+
override Location getLocation() {
110+
result = getExprLocationOverride(expr)
111+
or
112+
not exists(getExprLocationOverride(expr)) and
113+
result = expr.getLocation()
114+
}
110115

111116
/** Gets the expression corresponding to this node. */
112117
Expr getExpr() { result = expr }
113118
}
114119

120+
/**
121+
* Gets a location for `e` that's more accurate than `e.getLocation()`, if any.
122+
*/
123+
private Location getExprLocationOverride(Expr e) {
124+
// Base case: the parent has a better location than `e`.
125+
e.getLocation() instanceof UnknownExprLocation and
126+
result = e.getParent().getLocation() and
127+
not result instanceof UnknownLocation
128+
or
129+
// Recursive case: the parent has a location override that's better than what
130+
// `e` has.
131+
e.getLocation() instanceof UnknownExprLocation and
132+
result = getExprLocationOverride(e.getParent()) and
133+
not result instanceof UnknownLocation
134+
}
135+
115136
abstract class ParameterNode extends Node, TNode {
116137
/**
117138
* Holds if this node is the parameter of `c` at the specified (zero-based)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
| acrossLinkTargets.cpp:12:8:12:8 | x | acrossLinkTargets.cpp:19:27:19:32 | call to source |
2-
| file://:0:0:0:0 | t | lambdas.cpp:8:10:8:15 | call to source |
3-
| file://:0:0:0:0 | t | lambdas.cpp:8:10:8:15 | call to source |
4-
| file://:0:0:0:0 | t | lambdas.cpp:8:10:8:15 | call to source |
2+
| lambdas.cpp:14:3:14:6 | t | lambdas.cpp:8:10:8:15 | call to source |
53
| lambdas.cpp:18:8:18:8 | call to operator() | lambdas.cpp:8:10:8:15 | call to source |
4+
| lambdas.cpp:21:3:21:6 | t | lambdas.cpp:8:10:8:15 | call to source |
5+
| lambdas.cpp:29:3:29:6 | t | lambdas.cpp:8:10:8:15 | call to source |
66
| lambdas.cpp:35:8:35:8 | a | lambdas.cpp:8:10:8:15 | call to source |
77
| lambdas.cpp:41:8:41:8 | a | lambdas.cpp:8:10:8:15 | call to source |
88
| test.cpp:7:8:7:9 | t1 | test.cpp:6:12:6:17 | call to source |

‎cpp/ql/test/library-tests/dataflow/dataflow-tests/test_diff.expected‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
| lambdas.cpp:8:10:8:15 | file://:0:0:0:0 | AST only |
1+
| lambdas.cpp:8:10:8:15 | lambdas.cpp:14:3:14:6 | AST only |
22
| lambdas.cpp:8:10:8:15 | lambdas.cpp:18:8:18:8 | AST only |
3+
| lambdas.cpp:8:10:8:15 | lambdas.cpp:21:3:21:6 | AST only |
4+
| lambdas.cpp:8:10:8:15 | lambdas.cpp:29:3:29:6 | AST only |
35
| lambdas.cpp:8:10:8:15 | lambdas.cpp:35:8:35:8 | AST only |
46
| lambdas.cpp:8:10:8:15 | lambdas.cpp:41:8:41:8 | AST only |
57
| test.cpp:89:28:89:34 | test.cpp:92:8:92:14 | IR only |

‎cpp/ql/test/library-tests/dataflow/fields/flow.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@ edges
8484
| C.cpp:24:5:24:8 | this [post update] [s3, ... (1)] | C.cpp:18:12:18:18 | call to C [s3, ... (1)] |
8585
| C.cpp:24:5:24:25 | ... = ... [void] | C.cpp:24:5:24:8 | this [post update] [s3, ... (1)] |
8686
| C.cpp:24:16:24:25 | new [void] | C.cpp:24:5:24:25 | ... = ... [void] |
87-
| C.cpp:27:8:27:11 | `this` parameter in func [s1, ... (1)] | file://:0:0:0:0 | this [s1, ... (1)] |
88-
| C.cpp:27:8:27:11 | `this` parameter in func [s3, ... (1)] | file://:0:0:0:0 | this [s3, ... (1)] |
87+
| C.cpp:27:8:27:11 | `this` parameter in func [s1, ... (1)] | C.cpp:29:10:29:11 | this [s1, ... (1)] |
88+
| C.cpp:27:8:27:11 | `this` parameter in func [s3, ... (1)] | C.cpp:31:10:31:11 | this [s3, ... (1)] |
89+
| C.cpp:29:10:29:11 | this [s1, ... (1)] | C.cpp:29:10:29:11 | s1 |
90+
| C.cpp:31:10:31:11 | this [s3, ... (1)] | C.cpp:31:10:31:11 | s3 |
8991
| constructors.cpp:26:15:26:15 | f [a_, ... (1)] | constructors.cpp:28:10:28:10 | f [a_, ... (1)] |
9092
| constructors.cpp:26:15:26:15 | f [b_, ... (1)] | constructors.cpp:29:10:29:10 | f [b_, ... (1)] |
9193
| constructors.cpp:28:10:28:10 | f [a_, ... (1)] | constructors.cpp:28:12:28:12 | call to a |
@@ -102,8 +104,6 @@ edges
102104
| constructors.cpp:43:9:43:9 | g [b_, ... (1)] | constructors.cpp:26:15:26:15 | f [b_, ... (1)] |
103105
| constructors.cpp:46:9:46:9 | h [a_, ... (1)] | constructors.cpp:26:15:26:15 | f [a_, ... (1)] |
104106
| constructors.cpp:46:9:46:9 | h [b_, ... (1)] | constructors.cpp:26:15:26:15 | f [b_, ... (1)] |
105-
| file://:0:0:0:0 | this [s1, ... (1)] | C.cpp:29:10:29:11 | s1 |
106-
| file://:0:0:0:0 | this [s3, ... (1)] | C.cpp:31:10:31:11 | s3 |
107107
| simple.cpp:26:15:26:15 | f [a_, ... (1)] | simple.cpp:28:10:28:10 | f [a_, ... (1)] |
108108
| simple.cpp:26:15:26:15 | f [b_, ... (1)] | simple.cpp:29:10:29:10 | f [b_, ... (1)] |
109109
| simple.cpp:28:10:28:10 | f [a_, ... (1)] | simple.cpp:28:12:28:12 | call to a |

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
| file://:0:0:0:0 | this | file://:0:0:0:0 | this | |
2-
| file://:0:0:0:0 | this | file://:0:0:0:0 | this | |
3-
| file://:0:0:0:0 | this | file://:0:0:0:0 | this | |
4-
| file://:0:0:0:0 | this | file://:0:0:0:0 | this | |
5-
| file://:0:0:0:0 | this | file://:0:0:0:0 | this | |
6-
| file://:0:0:0:0 | this | file://:0:0:0:0 | this | |
71
| taint.cpp:4:27:4:33 | source1 | taint.cpp:6:13:6:19 | source1 | |
82
| taint.cpp:4:40:4:45 | clean1 | taint.cpp:5:8:5:13 | clean1 | |
93
| taint.cpp:4:40:4:45 | clean1 | taint.cpp:6:3:6:8 | clean1 | |
@@ -50,13 +44,14 @@
5044
| taint.cpp:71:14:71:17 | 0 | taint.cpp:71:14:71:17 | constructor init of field a | TAINT |
5145
| taint.cpp:71:14:71:17 | constructor init of field a [post-this] | taint.cpp:71:20:71:30 | constructor init of field b [pre-this] | |
5246
| taint.cpp:71:14:71:17 | constructor init of field a [pre-this] | taint.cpp:71:20:71:30 | constructor init of field b [pre-this] | |
53-
| taint.cpp:71:20:71:30 | constructor init of field b [post-this] | file://:0:0:0:0 | this | |
54-
| taint.cpp:71:20:71:30 | constructor init of field b [pre-this] | file://:0:0:0:0 | this | |
47+
| taint.cpp:71:20:71:30 | constructor init of field b [post-this] | taint.cpp:72:3:72:3 | this | |
48+
| taint.cpp:71:20:71:30 | constructor init of field b [pre-this] | taint.cpp:72:3:72:3 | this | |
5549
| taint.cpp:71:22:71:27 | call to source | taint.cpp:71:20:71:30 | constructor init of field b | TAINT |
56-
| taint.cpp:72:3:72:3 | this [post update] | file://:0:0:0:0 | this | |
50+
| taint.cpp:72:3:72:3 | this | taint.cpp:73:3:73:3 | this | |
51+
| taint.cpp:72:3:72:3 | this [post update] | taint.cpp:73:3:73:3 | this | |
5752
| taint.cpp:72:7:72:12 | call to source | taint.cpp:72:3:72:14 | ... = ... | |
5853
| taint.cpp:73:7:73:7 | 0 | taint.cpp:73:3:73:7 | ... = ... | |
59-
| taint.cpp:76:7:76:14 | `this` parameter in myMethod | file://:0:0:0:0 | this | |
54+
| taint.cpp:76:7:76:14 | `this` parameter in myMethod | taint.cpp:77:3:77:3 | this | |
6055
| taint.cpp:77:7:77:12 | call to source | taint.cpp:77:3:77:14 | ... = ... | |
6156
| taint.cpp:84:10:84:12 | call to MyClass | taint.cpp:86:2:86:4 | mc1 | |
6257
| taint.cpp:84:10:84:12 | call to MyClass | taint.cpp:88:7:88:9 | mc1 | |
@@ -176,17 +171,17 @@
176171
| taint.cpp:213:12:213:12 | x | taint.cpp:213:15:213:15 | ref arg y | |
177172
| taint.cpp:213:15:213:15 | ref arg y | taint.cpp:216:7:216:7 | y | |
178173
| taint.cpp:213:15:213:15 | y | taint.cpp:213:12:213:12 | ref arg x | |
179-
| taint.cpp:223:10:223:15 | call to source | file://:0:0:0:0 | t | |
180-
| taint.cpp:223:10:223:15 | call to source | file://:0:0:0:0 | t | |
181174
| taint.cpp:223:10:223:15 | call to source | taint.cpp:228:12:228:12 | t | |
175+
| taint.cpp:223:10:223:15 | call to source | taint.cpp:235:11:239:2 | t | |
176+
| taint.cpp:223:10:223:15 | call to source | taint.cpp:243:11:246:2 | t | |
182177
| taint.cpp:223:10:223:15 | call to source | taint.cpp:253:4:253:4 | t | |
183178
| taint.cpp:223:10:223:15 | call to source | taint.cpp:260:4:260:4 | t | |
184-
| taint.cpp:224:9:224:10 | 0 | file://:0:0:0:0 | u | |
185-
| taint.cpp:224:9:224:10 | 0 | file://:0:0:0:0 | u | |
186179
| taint.cpp:224:9:224:10 | 0 | taint.cpp:228:15:228:15 | u | |
180+
| taint.cpp:224:9:224:10 | 0 | taint.cpp:235:11:239:2 | u | |
181+
| taint.cpp:224:9:224:10 | 0 | taint.cpp:243:11:246:2 | u | |
187182
| taint.cpp:224:9:224:10 | 0 | taint.cpp:253:7:253:7 | u | |
188183
| taint.cpp:224:9:224:10 | 0 | taint.cpp:260:7:260:7 | u | |
189-
| taint.cpp:225:9:225:10 | 0 | file://:0:0:0:0 | v | |
184+
| taint.cpp:225:9:225:10 | 0 | taint.cpp:235:11:239:2 | v | |
190185
| taint.cpp:225:9:225:10 | 0 | taint.cpp:241:7:241:7 | v | |
191186
| taint.cpp:226:9:226:10 | 0 | taint.cpp:260:10:260:10 | w | |
192187
| taint.cpp:226:9:226:10 | 0 | taint.cpp:261:7:261:7 | w | |
@@ -196,8 +191,10 @@
196191
| taint.cpp:228:11:228:11 | `this` parameter in (constructor) | taint.cpp:243:11:243:11 | constructor init of field t [pre-this] | |
197192
| taint.cpp:228:11:232:2 | [...](...){...} | taint.cpp:233:7:233:7 | a | |
198193
| taint.cpp:228:11:232:2 | {...} | taint.cpp:228:11:232:2 | [...](...){...} | |
199-
| taint.cpp:228:17:228:17 | `this` parameter in operator() | file://:0:0:0:0 | this | |
200-
| taint.cpp:228:17:228:17 | `this` parameter in operator() | file://:0:0:0:0 | this | |
194+
| taint.cpp:228:17:228:17 | `this` parameter in operator() | taint.cpp:229:3:229:6 | this | |
195+
| taint.cpp:228:17:228:17 | `this` parameter in operator() | taint.cpp:244:3:244:6 | this | |
196+
| taint.cpp:229:3:229:6 | this | taint.cpp:230:3:230:6 | this | |
197+
| taint.cpp:230:3:230:6 | this | taint.cpp:231:3:231:11 | this | |
201198
| taint.cpp:235:11:235:11 | Unknown literal | taint.cpp:235:11:235:11 | constructor init of field t | TAINT |
202199
| taint.cpp:235:11:235:11 | Unknown literal | taint.cpp:235:11:235:11 | constructor init of field u | TAINT |
203200
| taint.cpp:235:11:235:11 | Unknown literal | taint.cpp:235:11:235:11 | constructor init of field v | TAINT |
@@ -208,16 +205,19 @@
208205
| 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] | |
209206
| taint.cpp:235:11:239:2 | [...](...){...} | taint.cpp:240:2:240:2 | b | |
210207
| taint.cpp:235:11:239:2 | {...} | taint.cpp:235:11:239:2 | [...](...){...} | |
211-
| taint.cpp:235:15:235:15 | `this` parameter in operator() | file://:0:0:0:0 | this | |
208+
| taint.cpp:235:15:235:15 | `this` parameter in operator() | taint.cpp:236:3:236:6 | this | |
209+
| taint.cpp:236:3:236:6 | this | taint.cpp:237:3:237:6 | this | |
210+
| taint.cpp:237:3:237:6 | this | taint.cpp:238:3:238:14 | this | |
212211
| taint.cpp:238:7:238:12 | call to source | taint.cpp:238:3:238:14 | ... = ... | |
213212
| taint.cpp:243:11:243:11 | Unknown literal | taint.cpp:243:11:243:11 | constructor init of field t | TAINT |
214213
| taint.cpp:243:11:243:11 | Unknown literal | taint.cpp:243:11:243:11 | constructor init of field u | TAINT |
215214
| taint.cpp:243:11:243:11 | `this` parameter in (constructor) | taint.cpp:228:11:228:11 | constructor init of field t [pre-this] | |
216215
| taint.cpp:243:11:243:11 | `this` parameter in (constructor) | taint.cpp:243:11:243:11 | constructor init of field t [pre-this] | |
217216
| taint.cpp:243:11:246:2 | [...](...){...} | taint.cpp:247:2:247:2 | c | |
218217
| taint.cpp:243:11:246:2 | {...} | taint.cpp:243:11:246:2 | [...](...){...} | |
219-
| taint.cpp:243:15:243:15 | `this` parameter in operator() | file://:0:0:0:0 | this | |
220-
| taint.cpp:243:15:243:15 | `this` parameter in operator() | file://:0:0:0:0 | this | |
218+
| taint.cpp:243:15:243:15 | `this` parameter in operator() | taint.cpp:229:3:229:6 | this | |
219+
| taint.cpp:243:15:243:15 | `this` parameter in operator() | taint.cpp:244:3:244:6 | this | |
220+
| taint.cpp:244:3:244:6 | this | taint.cpp:245:3:245:6 | this | |
221221
| taint.cpp:249:11:252:2 | [...](...){...} | taint.cpp:253:2:253:2 | d | |
222222
| taint.cpp:249:18:249:18 | a | taint.cpp:250:8:250:8 | a | |
223223
| taint.cpp:249:25:249:25 | b | taint.cpp:251:8:251:8 | b | |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
| file://:0:0:0:0 | t | taint.cpp:223:10:223:15 | call to source |
2-
| file://:0:0:0:0 | t | taint.cpp:223:10:223:15 | call to source |
3-
| file://:0:0:0:0 | t | taint.cpp:223:10:223:15 | call to source |
41
| taint.cpp:8:8:8:13 | clean1 | taint.cpp:4:27:4:33 | source1 |
52
| taint.cpp:16:8:16:14 | source1 | taint.cpp:12:22:12:27 | call to source |
63
| taint.cpp:17:8:17:16 | ++ ... | taint.cpp:12:22:12:27 | call to source |
@@ -25,6 +22,9 @@
2522
| taint.cpp:210:7:210:7 | x | taint.cpp:207:6:207:11 | call to source |
2623
| taint.cpp:215:7:215:7 | x | taint.cpp:207:6:207:11 | call to source |
2724
| taint.cpp:216:7:216:7 | y | taint.cpp:207:6:207:11 | call to source |
25+
| taint.cpp:229:3:229:6 | t | taint.cpp:223:10:223:15 | call to source |
2826
| taint.cpp:233:8:233:8 | call to operator() | taint.cpp:223:10:223:15 | call to source |
27+
| taint.cpp:236:3:236:6 | t | taint.cpp:223:10:223:15 | call to source |
28+
| taint.cpp:244:3:244:6 | t | taint.cpp:223:10:223:15 | call to source |
2929
| taint.cpp:250:8:250:8 | a | taint.cpp:223:10:223:15 | call to source |
3030
| taint.cpp:256:8:256:8 | a | taint.cpp:223:10:223:15 | call to source |

‎cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
| file://:0:0:0:0 | taint.cpp:223:10:223:15 | AST only |
21
| taint.cpp:41:7:41:13 | taint.cpp:35:12:35:17 | AST only |
32
| taint.cpp:42:7:42:13 | taint.cpp:35:12:35:17 | AST only |
43
| taint.cpp:43:7:43:13 | taint.cpp:37:22:37:27 | AST only |
@@ -15,6 +14,9 @@
1514
| taint.cpp:195:7:195:7 | taint.cpp:193:6:193:6 | AST only |
1615
| taint.cpp:215:7:215:7 | taint.cpp:207:6:207:11 | AST only |
1716
| taint.cpp:216:7:216:7 | taint.cpp:207:6:207:11 | AST only |
17+
| taint.cpp:229:3:229:6 | taint.cpp:223:10:223:15 | AST only |
1818
| taint.cpp:233:8:233:8 | taint.cpp:223:10:223:15 | AST only |
19+
| taint.cpp:236:3:236:6 | taint.cpp:223:10:223:15 | AST only |
20+
| taint.cpp:244:3:244:6 | taint.cpp:223:10:223:15 | AST only |
1921
| taint.cpp:250:8:250:8 | taint.cpp:223:10:223:15 | AST only |
2022
| taint.cpp:256:8:256:8 | taint.cpp:223:10:223:15 | AST only |

0 commit comments

Comments
 (0)