Skip to content

Commit 2cd23e5

Browse files
MathiasVPMathiasVP
committed
Accept test changes.
1 parent 8135dce commit 2cd23e5

File tree

24 files changed

+1483
-263
lines changed

24 files changed

+1483
-263
lines changed

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

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -389,25 +389,19 @@ edges
389389
| by_reference.cpp:24:5:24:17 | value | by_reference.cpp:11:48:11:52 | value |
390390
| by_reference.cpp:24:5:24:17 | value | by_reference.cpp:24:5:24:17 | this [post update] [a] |
391391
| by_reference.cpp:31:46:31:46 | *s [a] | by_reference.cpp:32:12:32:12 | s [read] [a] |
392-
| by_reference.cpp:31:46:31:46 | s [a] | by_reference.cpp:32:12:32:12 | s [read] [a] |
393392
| by_reference.cpp:32:12:32:12 | s [read] [a] | by_reference.cpp:32:15:32:15 | FieldAddress [read] |
394-
| by_reference.cpp:32:12:32:12 | s [read] [a] | by_reference.cpp:32:15:32:15 | FieldAddress [read] |
395-
| by_reference.cpp:32:15:32:15 | FieldAddress [read] | by_reference.cpp:31:16:31:28 | ReturnValue |
396393
| by_reference.cpp:32:15:32:15 | FieldAddress [read] | by_reference.cpp:31:16:31:28 | ReturnValue |
397394
| by_reference.cpp:35:9:35:19 | *#this [a] | by_reference.cpp:36:12:36:15 | this [read] [a] |
398-
| by_reference.cpp:35:9:35:19 | this [a] | by_reference.cpp:36:12:36:15 | this [read] [a] |
399-
| by_reference.cpp:36:12:36:15 | this [read] [a] | by_reference.cpp:36:18:36:18 | FieldAddress [read] |
400395
| by_reference.cpp:36:12:36:15 | this [read] [a] | by_reference.cpp:36:18:36:18 | FieldAddress [read] |
401396
| by_reference.cpp:36:18:36:18 | FieldAddress [read] | by_reference.cpp:35:9:35:19 | ReturnValue |
402-
| by_reference.cpp:36:18:36:18 | FieldAddress [read] | by_reference.cpp:35:9:35:19 | ReturnValue |
403-
| by_reference.cpp:39:9:39:21 | *#this [a] | by_reference.cpp:40:18:40:28 | this [a] |
397+
| by_reference.cpp:39:9:39:21 | *#this [a] | by_reference.cpp:40:12:40:15 | this indirection [a] |
398+
| by_reference.cpp:40:12:40:15 | this indirection [a] | by_reference.cpp:35:9:35:19 | *#this [a] |
399+
| by_reference.cpp:40:12:40:15 | this indirection [a] | by_reference.cpp:40:18:40:28 | call to getDirectly |
404400
| by_reference.cpp:40:18:40:28 | call to getDirectly | by_reference.cpp:39:9:39:21 | ReturnValue |
405-
| by_reference.cpp:40:18:40:28 | this [a] | by_reference.cpp:35:9:35:19 | this [a] |
406-
| by_reference.cpp:40:18:40:28 | this [a] | by_reference.cpp:40:18:40:28 | call to getDirectly |
407-
| by_reference.cpp:43:9:43:27 | *#this [a] | by_reference.cpp:44:12:44:24 | this [a] |
401+
| by_reference.cpp:43:9:43:27 | *#this [a] | by_reference.cpp:44:26:44:29 | this indirection [a] |
408402
| by_reference.cpp:44:12:44:24 | call to nonMemberGetA | by_reference.cpp:43:9:43:27 | ReturnValue |
409-
| by_reference.cpp:44:12:44:24 | this [a] | by_reference.cpp:31:46:31:46 | s [a] |
410-
| by_reference.cpp:44:12:44:24 | this [a] | by_reference.cpp:44:12:44:24 | call to nonMemberGetA |
403+
| by_reference.cpp:44:26:44:29 | this indirection [a] | by_reference.cpp:31:46:31:46 | *s [a] |
404+
| by_reference.cpp:44:26:44:29 | this indirection [a] | by_reference.cpp:44:12:44:24 | call to nonMemberGetA |
411405
| by_reference.cpp:50:5:50:15 | call to user_input | by_reference.cpp:15:26:15:30 | value |
412406
| by_reference.cpp:50:5:50:15 | call to user_input | by_reference.cpp:50:5:50:15 | s [post update] [a] |
413407
| by_reference.cpp:50:5:50:15 | s [post update] [a] | by_reference.cpp:51:8:51:8 | s indirection [a] |
@@ -1226,29 +1220,21 @@ nodes
12261220
| by_reference.cpp:24:5:24:17 | value | semmle.label | value |
12271221
| by_reference.cpp:24:19:24:22 | this [post update] [a] | semmle.label | this [post update] [a] |
12281222
| by_reference.cpp:31:16:31:28 | ReturnValue | semmle.label | ReturnValue |
1229-
| by_reference.cpp:31:16:31:28 | ReturnValue | semmle.label | ReturnValue |
12301223
| by_reference.cpp:31:46:31:46 | *s [a] | semmle.label | *s [a] |
1231-
| by_reference.cpp:31:46:31:46 | s [a] | semmle.label | s [a] |
12321224
| by_reference.cpp:32:12:32:12 | s [read] [a] | semmle.label | s [read] [a] |
1233-
| by_reference.cpp:32:12:32:12 | s [read] [a] | semmle.label | s [read] [a] |
1234-
| by_reference.cpp:32:15:32:15 | FieldAddress [read] | semmle.label | FieldAddress [read] |
12351225
| by_reference.cpp:32:15:32:15 | FieldAddress [read] | semmle.label | FieldAddress [read] |
12361226
| by_reference.cpp:35:9:35:19 | *#this [a] | semmle.label | *#this [a] |
12371227
| by_reference.cpp:35:9:35:19 | ReturnValue | semmle.label | ReturnValue |
1238-
| by_reference.cpp:35:9:35:19 | ReturnValue | semmle.label | ReturnValue |
1239-
| by_reference.cpp:35:9:35:19 | this [a] | semmle.label | this [a] |
12401228
| by_reference.cpp:36:12:36:15 | this [read] [a] | semmle.label | this [read] [a] |
1241-
| by_reference.cpp:36:12:36:15 | this [read] [a] | semmle.label | this [read] [a] |
1242-
| by_reference.cpp:36:18:36:18 | FieldAddress [read] | semmle.label | FieldAddress [read] |
12431229
| by_reference.cpp:36:18:36:18 | FieldAddress [read] | semmle.label | FieldAddress [read] |
12441230
| by_reference.cpp:39:9:39:21 | *#this [a] | semmle.label | *#this [a] |
12451231
| by_reference.cpp:39:9:39:21 | ReturnValue | semmle.label | ReturnValue |
1232+
| by_reference.cpp:40:12:40:15 | this indirection [a] | semmle.label | this indirection [a] |
12461233
| by_reference.cpp:40:18:40:28 | call to getDirectly | semmle.label | call to getDirectly |
1247-
| by_reference.cpp:40:18:40:28 | this [a] | semmle.label | this [a] |
12481234
| by_reference.cpp:43:9:43:27 | *#this [a] | semmle.label | *#this [a] |
12491235
| by_reference.cpp:43:9:43:27 | ReturnValue | semmle.label | ReturnValue |
12501236
| by_reference.cpp:44:12:44:24 | call to nonMemberGetA | semmle.label | call to nonMemberGetA |
1251-
| by_reference.cpp:44:12:44:24 | this [a] | semmle.label | this [a] |
1237+
| by_reference.cpp:44:26:44:29 | this indirection [a] | semmle.label | this indirection [a] |
12521238
| by_reference.cpp:50:5:50:15 | call to user_input | semmle.label | call to user_input |
12531239
| by_reference.cpp:50:5:50:15 | s [post update] [a] | semmle.label | s [post update] [a] |
12541240
| by_reference.cpp:50:17:50:26 | call to user_input | semmle.label | call to user_input |
@@ -1694,8 +1680,8 @@ subpaths
16941680
| D.cpp:51:19:51:25 | e | D.cpp:11:24:11:24 | e | D.cpp:11:29:11:32 | this [post update] [elem] | D.cpp:51:19:51:25 | call to getBox1 [post update] [elem] |
16951681
| by_reference.cpp:20:11:20:21 | value | by_reference.cpp:15:26:15:30 | value | by_reference.cpp:16:5:16:8 | this [post update] [a] | by_reference.cpp:20:11:20:21 | this [post update] [a] |
16961682
| by_reference.cpp:24:5:24:17 | value | by_reference.cpp:11:48:11:52 | value | by_reference.cpp:12:5:12:5 | s [post update] [a] | by_reference.cpp:24:5:24:17 | this [post update] [a] |
1697-
| by_reference.cpp:40:18:40:28 | this [a] | by_reference.cpp:35:9:35:19 | this [a] | by_reference.cpp:35:9:35:19 | ReturnValue | by_reference.cpp:40:18:40:28 | call to getDirectly |
1698-
| by_reference.cpp:44:12:44:24 | this [a] | by_reference.cpp:31:46:31:46 | s [a] | by_reference.cpp:31:16:31:28 | ReturnValue | by_reference.cpp:44:12:44:24 | call to nonMemberGetA |
1683+
| by_reference.cpp:40:12:40:15 | this indirection [a] | by_reference.cpp:35:9:35:19 | *#this [a] | by_reference.cpp:35:9:35:19 | ReturnValue | by_reference.cpp:40:18:40:28 | call to getDirectly |
1684+
| by_reference.cpp:44:26:44:29 | this indirection [a] | by_reference.cpp:31:46:31:46 | *s [a] | by_reference.cpp:31:16:31:28 | ReturnValue | by_reference.cpp:44:12:44:24 | call to nonMemberGetA |
16991685
| by_reference.cpp:50:5:50:15 | call to user_input | by_reference.cpp:15:26:15:30 | value | by_reference.cpp:16:5:16:8 | this [post update] [a] | by_reference.cpp:50:5:50:15 | s [post update] [a] |
17001686
| by_reference.cpp:51:8:51:8 | s indirection [a] | by_reference.cpp:35:9:35:19 | *#this [a] | by_reference.cpp:35:9:35:19 | ReturnValue | by_reference.cpp:51:10:51:20 | call to getDirectly |
17011687
| by_reference.cpp:56:5:56:17 | call to user_input | by_reference.cpp:19:28:19:32 | value | by_reference.cpp:20:5:20:8 | this [post update] [a] | by_reference.cpp:56:5:56:17 | s [post update] [a] |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void test_myint_member_assignment()
5454
mi.i = source();
5555

5656
sink(mi); // $ MISSING: ast,ir
57-
sink(mi.get()); // $ ast,ir
57+
sink(mi.get()); // $ ast MISSING: ir
5858
}
5959

6060
void test_myint_method_assignment()
@@ -64,7 +64,7 @@ void test_myint_method_assignment()
6464
mi.get() = source();
6565

6666
sink(mi); // $ ir MISSING: ast
67-
sink(mi.get()); // $ ast,ir
67+
sink(mi.get()); // $ ast MISSING: ir
6868
}
6969

7070
void test_myint_overloaded_assignment()
@@ -107,7 +107,7 @@ void test_myarray_method_assignment()
107107

108108
ma.get(0) = source();
109109

110-
sink(ma.get(0)); // $ ir MISSING: ast
110+
sink(ma.get(0)); // $ MISSING: ast,ir
111111
}
112112

113113
void test_myarray_overloaded_assignment()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ void test_map()
179179
m14.insert(std::make_pair("b", source()));
180180
m14.insert(std::make_pair("c", source()));
181181
m14.insert(std::make_pair("d", "d"));
182-
sink(m2.lower_bound("b")); // $ ast MISSING: ir
183-
sink(m2.upper_bound("b")); // $ ast MISSING: ir
182+
sink(m2.lower_bound("b")); // $ ast,ir
183+
sink(m2.upper_bound("b")); // $ ast,ir
184184
sink(m2.equal_range("b").first); // $ MISSING: ast,ir
185185
sink(m2.equal_range("b").second); // $ MISSING: ast,ir
186-
sink(m2.upper_bound("c")); // $ SPURIOUS: ast
186+
sink(m2.upper_bound("c")); // $ SPURIOUS: ast,ir
187187
sink(m2.equal_range("c").second);
188188

189189
// swap

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void test_range_based_for_loop_string() {
127127
}
128128

129129
for(char& c : s) {
130-
sink(c); // $ ast MISSING: ir
130+
sink(c); // $ ast,ir
131131
}
132132

133133
const std::string const_s(source());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ void test__strnextc(const char* source) {
648648
unsigned c = 0;
649649
do {
650650
c = _strnextc(source++);
651-
sink(c); // $ ast MISSING: ir
651+
sink(c); // $ ast,ir
652652
} while(c != '\0');
653653
c = _strnextc("");
654654
sink(c);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void test_range_based_for_loop_vector(int source1) {
2525
}
2626

2727
for(int& x : v) {
28-
sink(x); // $ ast MISSING: ir
28+
sink(x); // $ ast,ir
2929
}
3030

3131
const std::vector<int> const_v(100, source1);

0 commit comments

Comments
 (0)