Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5359f5d

Browse files
ian-semmleian-semmle
committed
C++: Accept test changes following fix_member_function_indices
1 parent 3e17196 commit 5359f5d

3 files changed

Lines changed: 69 additions & 48 deletions

File tree

‎cpp/ql/test/library-tests/members/getters/members.expected‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
| file://:0:0:0:0 | <none> | test.cpp:34:6:34:6 | g | g() | Orphan |
2-
| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(C &&) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
3-
| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(const C &) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
4-
| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:10 | f_template_C | C::f_template_C<double>(double) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() |
5-
| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:10 | f_template_C | C::f_template_C<int>(int) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() |
6-
| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:21 | f_template_C | C::f_template_C<T>(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
7-
| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:10 | f_template_C_D | C::f_template_C_D<int>(int) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() |
8-
| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:23 | f_template_C_D | C::f_template_C_D<T>(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
9-
| test.cpp:2:7:2:7 | C | test.cpp:10:10:10:12 | f_C | C::f_C() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
10-
| test.cpp:2:7:2:7 | C | test.cpp:11:10:11:14 | f_C_D | C::f_C_D() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
11-
| test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(D &&) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
12-
| test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(const D &) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
13-
| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:10 | f_template_C_D | D::f_template_C_D<double>(double) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() |
14-
| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:23 | f_template_C_D | D::f_template_C_D<T>(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
15-
| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:10 | f_template_D | D::f_template_D<double>(double) | getAMember(), getAMember(6), getAMemberFunction(), getDeclaringType() |
16-
| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:21 | f_template_D | D::f_template_D<T>(T) | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
17-
| test.cpp:14:7:14:7 | D | test.cpp:22:10:22:14 | f_C_D | D::f_C_D() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
18-
| test.cpp:14:7:14:7 | D | test.cpp:23:10:23:12 | f_D | D::f_D() | getAMember(), getAMember(6), getAMemberFunction(), getCanonicalMember(6), getDeclaringType() |
19-
| test.cpp:27:7:27:7 | E<T> | test.cpp:29:10:29:12 | f_E | E<T>::f_E() | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() |
20-
| test.cpp:27:7:27:7 | E<T> | test.cpp:31:10:31:16 | f_E_arg | E<T>::f_E_arg(E<T>) | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() |
21-
| test.cpp:27:7:27:7 | E<int> | test.cpp:27:7:27:7 | operator= | E<int>::operator=(E<int> &&) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
22-
| test.cpp:27:7:27:7 | E<int> | test.cpp:27:7:27:7 | operator= | E<int>::operator=(const E<int> &) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
23-
| test.cpp:27:7:27:7 | E<int> | test.cpp:29:10:29:10 | f_E | E<int>::f_E() | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
24-
| test.cpp:27:7:27:7 | E<int> | test.cpp:31:10:31:10 | f_E_arg | E<int>::f_E_arg(E<int>) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
2+
| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(C &&) | getAMember(), getAMember(5), getAMemberFunction(), getCanonicalMember(5), getDeclaringType() |
3+
| test.cpp:2:7:2:7 | C | test.cpp:2:7:2:7 | operator= | C::operator=(const C &) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
4+
| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:10 | f_template_C | C::f_template_C<double>(double) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() |
5+
| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:10 | f_template_C | C::f_template_C<int>(int) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() |
6+
| test.cpp:2:7:2:7 | C | test.cpp:5:10:5:21 | f_template_C | C::f_template_C<T>(T) | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() |
7+
| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:10 | f_template_C_D | C::f_template_C_D<int>(int) | getAMember(), getAMember(1), getAMemberFunction(), getDeclaringType() |
8+
| test.cpp:2:7:2:7 | C | test.cpp:8:10:8:23 | f_template_C_D | C::f_template_C_D<T>(T) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() |
9+
| test.cpp:2:7:2:7 | C | test.cpp:10:10:10:12 | f_C | C::f_C() | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() |
10+
| test.cpp:2:7:2:7 | C | test.cpp:11:10:11:14 | f_C_D | C::f_C_D() | getAMember(), getAMember(3), getAMemberFunction(), getCanonicalMember(3), getDeclaringType() |
11+
| test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(D &&) | getAMember(), getAMember(5), getAMemberFunction(), getCanonicalMember(5), getDeclaringType() |
12+
| test.cpp:14:7:14:7 | D | test.cpp:14:7:14:7 | operator= | D::operator=(const D &) | getAMember(), getAMember(4), getAMemberFunction(), getCanonicalMember(4), getDeclaringType() |
13+
| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:10 | f_template_C_D | D::f_template_C_D<double>(double) | getAMember(), getAMember(0), getAMemberFunction(), getDeclaringType() |
14+
| test.cpp:14:7:14:7 | D | test.cpp:17:10:17:23 | f_template_C_D | D::f_template_C_D<T>(T) | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() |
15+
| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:10 | f_template_D | D::f_template_D<double>(double) | getAMember(), getAMember(1), getAMemberFunction(), getDeclaringType() |
16+
| test.cpp:14:7:14:7 | D | test.cpp:20:10:20:21 | f_template_D | D::f_template_D<T>(T) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() |
17+
| test.cpp:14:7:14:7 | D | test.cpp:22:10:22:14 | f_C_D | D::f_C_D() | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() |
18+
| test.cpp:14:7:14:7 | D | test.cpp:23:10:23:12 | f_D | D::f_D() | getAMember(), getAMember(3), getAMemberFunction(), getCanonicalMember(3), getDeclaringType() |
19+
| test.cpp:27:7:27:7 | E<T> | test.cpp:29:10:29:12 | f_E | E<T>::f_E() | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() |
20+
| test.cpp:27:7:27:7 | E<T> | test.cpp:31:10:31:16 | f_E_arg | E<T>::f_E_arg(E<T>) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() |
21+
| test.cpp:27:7:27:7 | E<int> | test.cpp:27:7:27:7 | operator= | E<int>::operator=(E<int> &&) | getAMember(), getAMember(3), getAMemberFunction(), getCanonicalMember(3), getDeclaringType() |
22+
| test.cpp:27:7:27:7 | E<int> | test.cpp:27:7:27:7 | operator= | E<int>::operator=(const E<int> &) | getAMember(), getAMember(2), getAMemberFunction(), getCanonicalMember(2), getDeclaringType() |
23+
| test.cpp:27:7:27:7 | E<int> | test.cpp:29:10:29:10 | f_E | E<int>::f_E() | getAMember(), getAMember(0), getAMemberFunction(), getCanonicalMember(0), getDeclaringType() |
24+
| test.cpp:27:7:27:7 | E<int> | test.cpp:31:10:31:10 | f_E_arg | E<int>::f_E_arg(E<int>) | getAMember(), getAMember(1), getAMemberFunction(), getCanonicalMember(1), getDeclaringType() |

‎cpp/ql/test/library-tests/members/templates/members.expected‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22
| file://:0:0:0:0 | __va_list_tag | 1 __va_list_tag::fp_offset |
33
| file://:0:0:0:0 | __va_list_tag | 2 __va_list_tag::overflow_arg_area |
44
| file://:0:0:0:0 | __va_list_tag | 3 __va_list_tag::reg_save_area |
5-
| file://:0:0:0:0 | __va_list_tag | 6 __va_list_tag::operator= |
5+
| file://:0:0:0:0 | __va_list_tag | 4 __va_list_tag::operator= |
6+
| file://:0:0:0:0 | __va_list_tag | 5 __va_list_tag::operator= |
67
| h.h:2:7:2:8 | CA | 0 CA::CB<TB> |
78
| h.h:2:7:2:8 | CA | 0 CA::CB<double> |
89
| h.h:2:7:2:8 | CA | 0 CA::CB<float> |
910
| h.h:2:7:2:8 | CA | 0 CA::CB<int> |
10-
| h.h:2:7:2:8 | CA | 3 CA::operator= |
11+
| h.h:2:7:2:8 | CA | 1 CA::operator= |
12+
| h.h:2:7:2:8 | CA | 2 CA::operator= |
1113
| h.h:5:11:5:12 | CB<TB> | <none> |
12-
| h.h:5:11:5:12 | CB<double> | 2 CA::CB<double>::operator= |
13-
| h.h:5:11:5:12 | CB<float> | 2 CA::CB<float>::operator= |
14-
| h.h:5:11:5:12 | CB<int> | 2 CA::CB<int>::operator= |
14+
| h.h:5:11:5:12 | CB<double> | 0 CA::CB<double>::operator= |
15+
| h.h:5:11:5:12 | CB<double> | 1 CA::CB<double>::operator= |
16+
| h.h:5:11:5:12 | CB<float> | 0 CA::CB<float>::operator= |
17+
| h.h:5:11:5:12 | CB<float> | 1 CA::CB<float>::operator= |
18+
| h.h:5:11:5:12 | CB<int> | 0 CA::CB<int>::operator= |
19+
| h.h:5:11:5:12 | CB<int> | 1 CA::CB<int>::operator= |

‎cpp/ql/test/library-tests/structs/compatible_cpp/compatible.expected‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,57 @@
1-
| a1.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 2 | operator= |
1+
| a1.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 0 | operator= |
2+
| a1.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 1 | operator= |
23
| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 0 | x |
3-
| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 3 | operator= |
4+
| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 1 | operator= |
5+
| a1.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 2 | operator= |
46
| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 0 | empty |
57
| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 1 | nonempty |
68
| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 2 | i |
7-
| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 5 | operator= |
8-
| a2.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 2 | operator= |
9+
| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 3 | operator= |
10+
| a1.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 4 | operator= |
11+
| a2.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 0 | operator= |
12+
| a2.cpp:4:8:4:12 | Empty | 2 members | 2 locations | 1 | operator= |
913
| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 0 | x |
10-
| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 3 | operator= |
14+
| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 1 | operator= |
15+
| a2.cpp:6:8:6:15 | NonEmpty | 3 members | 2 locations | 2 | operator= |
1116
| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 0 | empty |
1217
| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 1 | nonempty |
1318
| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 2 | i |
14-
| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 5 | operator= |
19+
| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 3 | operator= |
20+
| a2.cpp:10:8:10:10 | Bar | 5 members | 2 locations | 4 | operator= |
1521
| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 0 | apple_x |
16-
| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 3 | operator= |
22+
| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 1 | operator= |
23+
| b1.cpp:6:7:6:21 | AppleCompatible | 3 members | 2 locations | 2 | operator= |
1724
| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 0 | banana_x |
18-
| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 3 | operator= |
25+
| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 1 | operator= |
26+
| b1.cpp:11:7:11:22 | BananaCompatible | 3 members | 2 locations | 2 | operator= |
1927
| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 0 | cherry_x |
20-
| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 3 | operator= |
28+
| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 1 | operator= |
29+
| b1.cpp:16:7:16:12 | Cherry | 3 members | 1 locations | 2 | operator= |
2130
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 0 | damson_x |
22-
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 4 | bar |
23-
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 4 | foo |
24-
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 4 | operator= |
31+
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 1 | bar |
32+
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 1 | foo |
33+
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 2 | operator= |
34+
| b1.cpp:23:7:23:12 | Damson | 5 members | 2 locations | 3 | operator= |
2535
| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 0 | apple_x |
26-
| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 3 | operator= |
36+
| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 1 | operator= |
37+
| b1.cpp:29:9:29:23 | AppleCompatible | 3 members | 1 locations | 2 | operator= |
2738
| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 0 | apple_x |
28-
| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 3 | operator= |
39+
| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 1 | operator= |
40+
| b2.cpp:2:7:2:21 | AppleCompatible | 3 members | 2 locations | 2 | operator= |
2941
| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 0 | banana_x |
30-
| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 3 | operator= |
42+
| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 1 | operator= |
43+
| b2.cpp:9:7:9:22 | BananaCompatible | 3 members | 2 locations | 2 | operator= |
3144
| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 0 | cherry_x |
32-
| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 3 | operator= |
45+
| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 1 | operator= |
46+
| b2.cpp:14:7:14:12 | Cherry | 3 members | 1 locations | 2 | operator= |
3347
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 0 | damson_x |
34-
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 4 | bar |
35-
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 4 | foo |
36-
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 4 | operator= |
48+
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 1 | bar |
49+
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 1 | foo |
50+
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 2 | operator= |
51+
| b2.cpp:21:7:21:12 | Damson | 5 members | 2 locations | 3 | operator= |
3752
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 0 | gp_offset |
3853
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 1 | fp_offset |
3954
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 2 | overflow_arg_area |
4055
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 3 | reg_save_area |
41-
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 6 | operator= |
56+
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 4 | operator= |
57+
| file://:0:0:0:0 | __va_list_tag | 6 members | 0 locations | 5 | operator= |

0 commit comments

Comments
 (0)