Skip to content

Commit b6ddb97

Browse files
committed
C++: Accept test changes.
1 parent f098b8e commit b6ddb97

File tree

7 files changed

+292
-238
lines changed

7 files changed

+292
-238
lines changed

cpp/ql/test/library-tests/ir/ir/aliased_ir.expected

Lines changed: 126 additions & 91 deletions
Large diffs are not rendered by default.

cpp/ql/test/library-tests/ir/ir/operand_locations.expected

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,8 @@
979979
| destructors_for_temps.cpp:39:32:39:53 | StoreValue | r39_37 |
980980
| destructors_for_temps.cpp:42:6:42:15 | ChiPartial | partial:m42_3 |
981981
| destructors_for_temps.cpp:42:6:42:15 | ChiTotal | total:m42_2 |
982-
| destructors_for_temps.cpp:42:6:42:15 | Phi | from 2:~m45_22 |
983-
| destructors_for_temps.cpp:42:6:42:15 | Phi | from 4:~m47_6 |
982+
| destructors_for_temps.cpp:42:6:42:15 | Phi | from 2:~m47_5 |
983+
| destructors_for_temps.cpp:42:6:42:15 | Phi | from 4:~m47_14 |
984984
| destructors_for_temps.cpp:42:6:42:15 | SideEffect | ~m42_7 |
985985
| destructors_for_temps.cpp:42:22:42:22 | Address | &:r42_5 |
986986
| destructors_for_temps.cpp:43:26:43:26 | Address | &:r43_1 |
@@ -1011,36 +1011,57 @@
10111011
| destructors_for_temps.cpp:45:39:45:60 | Address | &:r45_5 |
10121012
| destructors_for_temps.cpp:45:39:45:60 | Address | &:r45_5 |
10131013
| destructors_for_temps.cpp:45:39:45:60 | Address | &:r45_5 |
1014+
| destructors_for_temps.cpp:45:39:45:60 | Address | &:r45_26 |
1015+
| destructors_for_temps.cpp:45:39:45:60 | Address | &:r45_26 |
10141016
| destructors_for_temps.cpp:45:39:45:60 | Arg(this) | this:r45_5 |
10151017
| destructors_for_temps.cpp:45:39:45:60 | Arg(this) | this:r45_5 |
1018+
| destructors_for_temps.cpp:45:39:45:60 | Arg(this) | this:r45_26 |
10161019
| destructors_for_temps.cpp:45:39:45:60 | CallTarget | func:r45_7 |
1020+
| destructors_for_temps.cpp:45:39:45:60 | CallTarget | func:r45_27 |
10171021
| destructors_for_temps.cpp:45:39:45:60 | ChiPartial | partial:m45_9 |
10181022
| destructors_for_temps.cpp:45:39:45:60 | ChiPartial | partial:m45_11 |
10191023
| destructors_for_temps.cpp:45:39:45:60 | ChiPartial | partial:m45_18 |
1024+
| destructors_for_temps.cpp:45:39:45:60 | ChiPartial | partial:m45_29 |
1025+
| destructors_for_temps.cpp:45:39:45:60 | ChiPartial | partial:m45_32 |
10201026
| destructors_for_temps.cpp:45:39:45:60 | ChiTotal | total:m43_6 |
10211027
| destructors_for_temps.cpp:45:39:45:60 | ChiTotal | total:m45_6 |
10221028
| destructors_for_temps.cpp:45:39:45:60 | ChiTotal | total:m45_12 |
1029+
| destructors_for_temps.cpp:45:39:45:60 | ChiTotal | total:m45_19 |
1030+
| destructors_for_temps.cpp:45:39:45:60 | ChiTotal | total:m45_22 |
10231031
| destructors_for_temps.cpp:45:39:45:60 | SideEffect | m45_12 |
1032+
| destructors_for_temps.cpp:45:39:45:60 | SideEffect | m45_19 |
10241033
| destructors_for_temps.cpp:45:39:45:60 | SideEffect | ~m43_6 |
1034+
| destructors_for_temps.cpp:45:39:45:60 | SideEffect | ~m45_22 |
1035+
| destructors_for_temps.cpp:45:39:45:60 | Unary | r45_5 |
10251036
| destructors_for_temps.cpp:45:62:45:66 | Arg(1) | 1:r45_14 |
10261037
| destructors_for_temps.cpp:45:62:45:66 | CallTarget | func:r45_13 |
10271038
| destructors_for_temps.cpp:45:62:45:66 | ChiPartial | partial:m45_15 |
10281039
| destructors_for_temps.cpp:45:62:45:66 | ChiTotal | total:m45_10 |
10291040
| destructors_for_temps.cpp:45:62:45:66 | SideEffect | ~m45_10 |
1030-
| destructors_for_temps.cpp:47:1:47:1 | Address | &:r47_2 |
1031-
| destructors_for_temps.cpp:47:1:47:1 | Address | &:r47_2 |
1032-
| destructors_for_temps.cpp:47:1:47:1 | Arg(this) | this:r47_2 |
1033-
| destructors_for_temps.cpp:47:1:47:1 | CallTarget | func:r47_3 |
1034-
| destructors_for_temps.cpp:47:1:47:1 | ChiPartial | partial:m47_5 |
1035-
| destructors_for_temps.cpp:47:1:47:1 | ChiPartial | partial:m47_8 |
1041+
| destructors_for_temps.cpp:47:1:47:1 | Address | &:r47_1 |
1042+
| destructors_for_temps.cpp:47:1:47:1 | Address | &:r47_1 |
1043+
| destructors_for_temps.cpp:47:1:47:1 | Address | &:r47_10 |
1044+
| destructors_for_temps.cpp:47:1:47:1 | Address | &:r47_10 |
1045+
| destructors_for_temps.cpp:47:1:47:1 | Arg(this) | this:r47_1 |
1046+
| destructors_for_temps.cpp:47:1:47:1 | Arg(this) | this:r47_10 |
1047+
| destructors_for_temps.cpp:47:1:47:1 | CallTarget | func:r47_2 |
1048+
| destructors_for_temps.cpp:47:1:47:1 | CallTarget | func:r47_11 |
1049+
| destructors_for_temps.cpp:47:1:47:1 | ChiPartial | partial:m47_4 |
1050+
| destructors_for_temps.cpp:47:1:47:1 | ChiPartial | partial:m47_7 |
1051+
| destructors_for_temps.cpp:47:1:47:1 | ChiPartial | partial:m47_13 |
1052+
| destructors_for_temps.cpp:47:1:47:1 | ChiPartial | partial:m47_16 |
10361053
| destructors_for_temps.cpp:47:1:47:1 | ChiTotal | total:m43_6 |
10371054
| destructors_for_temps.cpp:47:1:47:1 | ChiTotal | total:m43_8 |
1055+
| destructors_for_temps.cpp:47:1:47:1 | ChiTotal | total:m43_8 |
1056+
| destructors_for_temps.cpp:47:1:47:1 | ChiTotal | total:m45_30 |
1057+
| destructors_for_temps.cpp:47:1:47:1 | SideEffect | m43_8 |
10381058
| destructors_for_temps.cpp:47:1:47:1 | SideEffect | m43_8 |
10391059
| destructors_for_temps.cpp:47:1:47:1 | SideEffect | ~m43_6 |
1060+
| destructors_for_temps.cpp:47:1:47:1 | SideEffect | ~m45_30 |
10401061
| destructors_for_temps.cpp:49:6:49:15 | ChiPartial | partial:m49_3 |
10411062
| destructors_for_temps.cpp:49:6:49:15 | ChiTotal | total:m49_2 |
1042-
| destructors_for_temps.cpp:49:6:49:15 | Phi | from 2:~m51_26 |
1043-
| destructors_for_temps.cpp:49:6:49:15 | Phi | from 4:~m52_6 |
1063+
| destructors_for_temps.cpp:49:6:49:15 | Phi | from 2:~m52_5 |
1064+
| destructors_for_temps.cpp:49:6:49:15 | Phi | from 4:~m52_14 |
10441065
| destructors_for_temps.cpp:49:6:49:15 | SideEffect | ~m49_7 |
10451066
| destructors_for_temps.cpp:49:22:49:22 | Address | &:r49_5 |
10461067
| destructors_for_temps.cpp:50:26:50:26 | Address | &:r50_1 |
@@ -1104,15 +1125,25 @@
11041125
| destructors_for_temps.cpp:51:75:51:96 | Load | m51_37 |
11051126
| destructors_for_temps.cpp:51:75:51:96 | SideEffect | ~m50_6 |
11061127
| destructors_for_temps.cpp:51:75:51:96 | StoreValue | r51_38 |
1107-
| destructors_for_temps.cpp:52:1:52:1 | Address | &:r52_2 |
1108-
| destructors_for_temps.cpp:52:1:52:1 | Address | &:r52_2 |
1109-
| destructors_for_temps.cpp:52:1:52:1 | Arg(this) | this:r52_2 |
1110-
| destructors_for_temps.cpp:52:1:52:1 | CallTarget | func:r52_3 |
1111-
| destructors_for_temps.cpp:52:1:52:1 | ChiPartial | partial:m52_5 |
1112-
| destructors_for_temps.cpp:52:1:52:1 | ChiPartial | partial:m52_8 |
1128+
| destructors_for_temps.cpp:52:1:52:1 | Address | &:r52_1 |
1129+
| destructors_for_temps.cpp:52:1:52:1 | Address | &:r52_1 |
1130+
| destructors_for_temps.cpp:52:1:52:1 | Address | &:r52_10 |
1131+
| destructors_for_temps.cpp:52:1:52:1 | Address | &:r52_10 |
1132+
| destructors_for_temps.cpp:52:1:52:1 | Arg(this) | this:r52_1 |
1133+
| destructors_for_temps.cpp:52:1:52:1 | Arg(this) | this:r52_10 |
1134+
| destructors_for_temps.cpp:52:1:52:1 | CallTarget | func:r52_2 |
1135+
| destructors_for_temps.cpp:52:1:52:1 | CallTarget | func:r52_11 |
1136+
| destructors_for_temps.cpp:52:1:52:1 | ChiPartial | partial:m52_4 |
1137+
| destructors_for_temps.cpp:52:1:52:1 | ChiPartial | partial:m52_7 |
1138+
| destructors_for_temps.cpp:52:1:52:1 | ChiPartial | partial:m52_13 |
1139+
| destructors_for_temps.cpp:52:1:52:1 | ChiPartial | partial:m52_16 |
1140+
| destructors_for_temps.cpp:52:1:52:1 | ChiTotal | total:m50_8 |
11131141
| destructors_for_temps.cpp:52:1:52:1 | ChiTotal | total:m50_8 |
1142+
| destructors_for_temps.cpp:52:1:52:1 | ChiTotal | total:m51_26 |
11141143
| destructors_for_temps.cpp:52:1:52:1 | ChiTotal | total:m51_35 |
11151144
| destructors_for_temps.cpp:52:1:52:1 | SideEffect | m50_8 |
1145+
| destructors_for_temps.cpp:52:1:52:1 | SideEffect | m50_8 |
1146+
| destructors_for_temps.cpp:52:1:52:1 | SideEffect | ~m51_26 |
11161147
| destructors_for_temps.cpp:52:1:52:1 | SideEffect | ~m51_35 |
11171148
| destructors_for_temps.cpp:54:6:54:15 | ChiPartial | partial:m54_3 |
11181149
| destructors_for_temps.cpp:54:6:54:15 | ChiTotal | total:m54_2 |
@@ -12258,7 +12289,7 @@
1225812289
| ir.cpp:2273:6:2273:24 | ChiTotal | total:m2273_2 |
1225912290
| ir.cpp:2273:6:2273:24 | Phi | from 2:~m2273_10 |
1226012291
| ir.cpp:2273:6:2273:24 | Phi | from 6:~m2282_8 |
12261-
| ir.cpp:2273:6:2273:24 | Phi | from 9:~m2275_6 |
12292+
| ir.cpp:2273:6:2273:24 | Phi | from 9:~m2280_5 |
1226212293
| ir.cpp:2273:6:2273:24 | Phi | from 10:~m2289_1 |
1226312294
| ir.cpp:2273:6:2273:24 | SideEffect | ~m2273_7 |
1226412295
| ir.cpp:2273:31:2273:31 | Address | &:r2273_5 |
@@ -12292,22 +12323,32 @@
1229212323
| ir.cpp:2280:3:2280:3 | Address | &:r2280_1 |
1229312324
| ir.cpp:2280:3:2280:3 | Address | &:r2280_9 |
1229412325
| ir.cpp:2280:3:2280:3 | Address | &:r2280_9 |
12326+
| ir.cpp:2280:3:2280:3 | Address | &:r2280_17 |
12327+
| ir.cpp:2280:3:2280:3 | Address | &:r2280_17 |
1229512328
| ir.cpp:2280:3:2280:3 | Arg(this) | this:r2280_1 |
1229612329
| ir.cpp:2280:3:2280:3 | Arg(this) | this:r2280_9 |
12330+
| ir.cpp:2280:3:2280:3 | Arg(this) | this:r2280_17 |
1229712331
| ir.cpp:2280:3:2280:3 | CallTarget | func:r2280_2 |
1229812332
| ir.cpp:2280:3:2280:3 | CallTarget | func:r2280_10 |
12333+
| ir.cpp:2280:3:2280:3 | CallTarget | func:r2280_18 |
1229912334
| ir.cpp:2280:3:2280:3 | ChiPartial | partial:m2280_4 |
1230012335
| ir.cpp:2280:3:2280:3 | ChiPartial | partial:m2280_7 |
1230112336
| ir.cpp:2280:3:2280:3 | ChiPartial | partial:m2280_12 |
1230212337
| ir.cpp:2280:3:2280:3 | ChiPartial | partial:m2280_15 |
12338+
| ir.cpp:2280:3:2280:3 | ChiPartial | partial:m2280_20 |
12339+
| ir.cpp:2280:3:2280:3 | ChiPartial | partial:m2280_23 |
12340+
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2275_6 |
12341+
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2275_8 |
1230312342
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2275_8 |
1230412343
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2279_6 |
1230512344
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2279_8 |
12306-
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2280_5 |
12345+
| ir.cpp:2280:3:2280:3 | ChiTotal | total:m2280_13 |
12346+
| ir.cpp:2280:3:2280:3 | SideEffect | m2275_8 |
1230712347
| ir.cpp:2280:3:2280:3 | SideEffect | m2275_8 |
1230812348
| ir.cpp:2280:3:2280:3 | SideEffect | m2279_8 |
12349+
| ir.cpp:2280:3:2280:3 | SideEffect | ~m2275_6 |
1230912350
| ir.cpp:2280:3:2280:3 | SideEffect | ~m2279_6 |
12310-
| ir.cpp:2280:3:2280:3 | SideEffect | ~m2280_5 |
12351+
| ir.cpp:2280:3:2280:3 | SideEffect | ~m2280_13 |
1231112352
| ir.cpp:2281:22:2281:22 | Address | &:r2281_2 |
1231212353
| ir.cpp:2281:22:2281:22 | Address | &:r2281_2 |
1231312354
| ir.cpp:2281:22:2281:22 | Address | &:r2281_4 |
@@ -12319,10 +12360,10 @@
1231912360
| ir.cpp:2282:5:2282:19 | CallTarget | func:r2282_3 |
1232012361
| ir.cpp:2282:5:2282:19 | ChiPartial | partial:m2282_7 |
1232112362
| ir.cpp:2282:5:2282:19 | ChiPartial | partial:m2282_10 |
12322-
| ir.cpp:2282:5:2282:19 | ChiTotal | total:m2275_6 |
12363+
| ir.cpp:2282:5:2282:19 | ChiTotal | total:m2280_5 |
1232312364
| ir.cpp:2282:5:2282:19 | ChiTotal | total:m2282_2 |
1232412365
| ir.cpp:2282:5:2282:19 | Load | m2282_11 |
12325-
| ir.cpp:2282:5:2282:19 | SideEffect | ~m2275_6 |
12366+
| ir.cpp:2282:5:2282:19 | SideEffect | ~m2280_5 |
1232612367
| ir.cpp:2282:18:2282:18 | Address | &:r2282_4 |
1232712368
| ir.cpp:2282:18:2282:18 | Address | &:r2282_5 |
1232812369
| ir.cpp:2282:18:2282:18 | Arg(0) | 0:r2282_5 |
@@ -12332,8 +12373,8 @@
1233212373
| ir.cpp:2284:24:2284:24 | Address | &:r2284_2 |
1233312374
| ir.cpp:2284:24:2284:24 | Address | &:r2284_4 |
1233412375
| ir.cpp:2284:24:2284:24 | Load | m2284_3 |
12335-
| ir.cpp:2289:1:2289:1 | Phi | from 4:~m2280_13 |
12336-
| ir.cpp:2289:1:2289:1 | Phi | from 8:~m2275_6 |
12376+
| ir.cpp:2289:1:2289:1 | Phi | from 4:~m2280_21 |
12377+
| ir.cpp:2289:1:2289:1 | Phi | from 8:~m2280_5 |
1233712378
| ir.cpp:2291:6:2291:18 | ChiPartial | partial:m2291_3 |
1233812379
| ir.cpp:2291:6:2291:18 | ChiTotal | total:m2291_2 |
1233912380
| ir.cpp:2291:6:2291:18 | SideEffect | ~m2299_14 |

cpp/ql/test/library-tests/ir/ir/raw_consistency.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ multipleIRTypes
2020
lostReachability
2121
backEdgeCountMismatch
2222
useNotDominatedByDefinition
23-
| destructors_for_temps.cpp:45:39:45:60 | Unary | Operand 'Unary' is not dominated by its definition in function '$@'. | destructors_for_temps.cpp:42:6:42:15 | void temp_test6(bool) | void temp_test6(bool) |
2423
| ir.cpp:1535:8:1535:8 | Unary | Operand 'Unary' is not dominated by its definition in function '$@'. | ir.cpp:1535:8:1535:8 | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() |
2524
| try_except.c:13:13:13:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:6:6:6:6 | void f() | void f() |
2625
| try_except.c:13:13:13:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:6:6:6:6 | void f() | void f() |

0 commit comments

Comments
 (0)