Skip to content

Commit 0e9f5f6

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent 38b1005 commit 0e9f5f6

File tree

3 files changed

+159
-177
lines changed

3 files changed

+159
-177
lines changed

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

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12226,74 +12226,68 @@ ir.cpp:
1222612226
# 2099| r2099_1(glval<unknown>) = FunctionAddress[operator new[]] :
1222712227
# 2099| r2099_2(glval<unsigned long>) = VariableAddress[n] :
1222812228
# 2099| r2099_3(unsigned long) = Load[n] : &:r2099_2, m2098_6
12229-
# 2099| r2099_4(unsigned long) = Convert : r2099_3
12230-
# 2099| r2099_5(unsigned long) = Constant[4] :
12231-
# 2099| r2099_6(unsigned long) = Mul : r2099_4, r2099_5
12232-
# 2099| r2099_7(void *) = Call[operator new[]] : func:r2099_1, 0:r2099_6
12233-
# 2099| m2099_8(unknown) = ^CallSideEffect : ~m2098_4
12234-
# 2099| m2099_9(unknown) = Chi : total:m2098_4, partial:m2099_8
12235-
# 2099| m2099_10(unknown) = ^InitializeDynamicAllocation : &:r2099_7
12236-
# 2099| r2099_11(int *) = Convert : r2099_7
12229+
# 2099| r2099_4(unsigned long) = Constant[4] :
12230+
# 2099| r2099_5(unsigned long) = Mul : r2099_3, r2099_4
12231+
# 2099| r2099_6(void *) = Call[operator new[]] : func:r2099_1, 0:r2099_5
12232+
# 2099| m2099_7(unknown) = ^CallSideEffect : ~m2098_4
12233+
# 2099| m2099_8(unknown) = Chi : total:m2098_4, partial:m2099_7
12234+
# 2099| m2099_9(unknown) = ^InitializeDynamicAllocation : &:r2099_6
12235+
# 2099| r2099_10(int *) = Convert : r2099_6
1223712236
# 2100| r2100_1(glval<unknown>) = FunctionAddress[operator new[]] :
1223812237
# 2100| r2100_2(glval<unsigned long>) = VariableAddress[n] :
1223912238
# 2100| r2100_3(unsigned long) = Load[n] : &:r2100_2, m2098_6
12240-
# 2100| r2100_4(unsigned long) = Convert : r2100_3
12241-
# 2100| r2100_5(unsigned long) = Constant[4] :
12242-
# 2100| r2100_6(unsigned long) = Mul : r2100_4, r2100_5
12243-
# 2100| r2100_7(float) = Constant[1.0] :
12244-
# 2100| r2100_8(void *) = Call[operator new[]] : func:r2100_1, 0:r2100_6, 1:r2100_7
12245-
# 2100| m2100_9(unknown) = ^CallSideEffect : ~m2099_9
12246-
# 2100| m2100_10(unknown) = Chi : total:m2099_9, partial:m2100_9
12247-
# 2100| m2100_11(unknown) = ^InitializeDynamicAllocation : &:r2100_8
12248-
# 2100| r2100_12(int *) = Convert : r2100_8
12239+
# 2100| r2100_4(unsigned long) = Constant[4] :
12240+
# 2100| r2100_5(unsigned long) = Mul : r2100_3, r2100_4
12241+
# 2100| r2100_6(float) = Constant[1.0] :
12242+
# 2100| r2100_7(void *) = Call[operator new[]] : func:r2100_1, 0:r2100_5, 1:r2100_6
12243+
# 2100| m2100_8(unknown) = ^CallSideEffect : ~m2099_8
12244+
# 2100| m2100_9(unknown) = Chi : total:m2099_8, partial:m2100_8
12245+
# 2100| m2100_10(unknown) = ^InitializeDynamicAllocation : &:r2100_7
12246+
# 2100| r2100_11(int *) = Convert : r2100_7
1224912247
# 2101| r2101_1(glval<unknown>) = FunctionAddress[operator new[]] :
1225012248
# 2101| r2101_2(glval<unsigned long>) = VariableAddress[n] :
1225112249
# 2101| r2101_3(unsigned long) = Load[n] : &:r2101_2, m2098_6
12252-
# 2101| r2101_4(unsigned long) = Convert : r2101_3
12253-
# 2101| r2101_5(unsigned long) = Constant[8] :
12254-
# 2101| r2101_6(unsigned long) = Mul : r2101_4, r2101_5
12255-
# 2101| r2101_7(void *) = Call[operator new[]] : func:r2101_1, 0:r2101_6
12256-
# 2101| m2101_8(unknown) = ^CallSideEffect : ~m2100_10
12257-
# 2101| m2101_9(unknown) = Chi : total:m2100_10, partial:m2101_8
12258-
# 2101| m2101_10(unknown) = ^InitializeDynamicAllocation : &:r2101_7
12259-
# 2101| r2101_11(String *) = Convert : r2101_7
12250+
# 2101| r2101_4(unsigned long) = Constant[8] :
12251+
# 2101| r2101_5(unsigned long) = Mul : r2101_3, r2101_4
12252+
# 2101| r2101_6(void *) = Call[operator new[]] : func:r2101_1, 0:r2101_5
12253+
# 2101| m2101_7(unknown) = ^CallSideEffect : ~m2100_9
12254+
# 2101| m2101_8(unknown) = Chi : total:m2100_9, partial:m2101_7
12255+
# 2101| m2101_9(unknown) = ^InitializeDynamicAllocation : &:r2101_6
12256+
# 2101| r2101_10(String *) = Convert : r2101_6
1226012257
# 2102| r2102_1(glval<unknown>) = FunctionAddress[operator new[]] :
1226112258
# 2102| r2102_2(glval<unsigned long>) = VariableAddress[n] :
1226212259
# 2102| r2102_3(unsigned long) = Load[n] : &:r2102_2, m2098_6
12263-
# 2102| r2102_4(unsigned long) = Convert : r2102_3
12264-
# 2102| r2102_5(unsigned long) = Constant[256] :
12265-
# 2102| r2102_6(unsigned long) = Mul : r2102_4, r2102_5
12266-
# 2102| r2102_7(align_val_t) = Constant[128] :
12267-
# 2102| r2102_8(void *) = Call[operator new[]] : func:r2102_1, 0:r2102_6, 1:r2102_7
12268-
# 2102| m2102_9(unknown) = ^CallSideEffect : ~m2101_9
12269-
# 2102| m2102_10(unknown) = Chi : total:m2101_9, partial:m2102_9
12270-
# 2102| m2102_11(unknown) = ^InitializeDynamicAllocation : &:r2102_8
12271-
# 2102| r2102_12(Overaligned *) = Convert : r2102_8
12260+
# 2102| r2102_4(unsigned long) = Constant[256] :
12261+
# 2102| r2102_5(unsigned long) = Mul : r2102_3, r2102_4
12262+
# 2102| r2102_6(align_val_t) = Constant[128] :
12263+
# 2102| r2102_7(void *) = Call[operator new[]] : func:r2102_1, 0:r2102_5, 1:r2102_6
12264+
# 2102| m2102_8(unknown) = ^CallSideEffect : ~m2101_8
12265+
# 2102| m2102_9(unknown) = Chi : total:m2101_8, partial:m2102_8
12266+
# 2102| m2102_10(unknown) = ^InitializeDynamicAllocation : &:r2102_7
12267+
# 2102| r2102_11(Overaligned *) = Convert : r2102_7
1227212268
# 2103| r2103_1(glval<unknown>) = FunctionAddress[operator new[]] :
1227312269
# 2103| r2103_2(glval<unsigned long>) = VariableAddress[n] :
1227412270
# 2103| r2103_3(unsigned long) = Load[n] : &:r2103_2, m2098_6
12275-
# 2103| r2103_4(unsigned long) = Convert : r2103_3
12276-
# 2103| r2103_5(unsigned long) = Constant[1] :
12277-
# 2103| r2103_6(unsigned long) = Mul : r2103_4, r2103_5
12278-
# 2103| r2103_7(void *) = Call[operator new[]] : func:r2103_1, 0:r2103_6
12279-
# 2103| m2103_8(unknown) = ^CallSideEffect : ~m2102_10
12280-
# 2103| m2103_9(unknown) = Chi : total:m2102_10, partial:m2103_8
12281-
# 2103| m2103_10(unknown) = ^InitializeDynamicAllocation : &:r2103_7
12282-
# 2103| r2103_11(DefaultCtorWithDefaultParam *) = Convert : r2103_7
12271+
# 2103| r2103_4(unsigned long) = Constant[1] :
12272+
# 2103| r2103_5(unsigned long) = Mul : r2103_3, r2103_4
12273+
# 2103| r2103_6(void *) = Call[operator new[]] : func:r2103_1, 0:r2103_5
12274+
# 2103| m2103_7(unknown) = ^CallSideEffect : ~m2102_9
12275+
# 2103| m2103_8(unknown) = Chi : total:m2102_9, partial:m2103_7
12276+
# 2103| m2103_9(unknown) = ^InitializeDynamicAllocation : &:r2103_6
12277+
# 2103| r2103_10(DefaultCtorWithDefaultParam *) = Convert : r2103_6
1228312278
# 2104| r2104_1(glval<unknown>) = FunctionAddress[operator new[]] :
1228412279
# 2104| r2104_2(glval<unsigned long>) = VariableAddress[n] :
1228512280
# 2104| r2104_3(unsigned long) = Load[n] : &:r2104_2, m2098_6
12286-
# 2104| r2104_4(unsigned long) = Convert : r2104_3
12287-
# 2104| r2104_5(unsigned long) = Constant[4] :
12288-
# 2104| r2104_6(unsigned long) = Mul : r2104_4, r2104_5
12289-
# 2104| r2104_7(void *) = Call[operator new[]] : func:r2104_1, 0:r2104_6
12290-
# 2104| m2104_8(unknown) = ^CallSideEffect : ~m2103_9
12291-
# 2104| m2104_9(unknown) = Chi : total:m2103_9, partial:m2104_8
12292-
# 2104| m2104_10(unknown) = ^InitializeDynamicAllocation : &:r2104_7
12293-
# 2104| r2104_11(int *) = Convert : r2104_7
12281+
# 2104| r2104_4(unsigned long) = Constant[4] :
12282+
# 2104| r2104_5(unsigned long) = Mul : r2104_3, r2104_4
12283+
# 2104| r2104_6(void *) = Call[operator new[]] : func:r2104_1, 0:r2104_5
12284+
# 2104| m2104_7(unknown) = ^CallSideEffect : ~m2103_8
12285+
# 2104| m2104_8(unknown) = Chi : total:m2103_8, partial:m2104_7
12286+
# 2104| m2104_9(unknown) = ^InitializeDynamicAllocation : &:r2104_6
12287+
# 2104| r2104_10(int *) = Convert : r2104_6
1229412288
# 2105| v2105_1(void) = NoOp :
1229512289
# 2098| v2098_7(void) = ReturnVoid :
12296-
# 2098| v2098_8(void) = AliasedUse : ~m2104_9
12290+
# 2098| v2098_8(void) = AliasedUse : ~m2104_8
1229712291
# 2098| v2098_9(void) = ExitFunction :
1229812292

1229912293
perf-regression.cpp:

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

Lines changed: 49 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -9898,82 +9898,76 @@
98989898
| ir.cpp:2095:12:2095:12 | StoreValue | r2095_3 |
98999899
| ir.cpp:2098:6:2098:24 | ChiPartial | partial:m2098_3 |
99009900
| ir.cpp:2098:6:2098:24 | ChiTotal | total:m2098_2 |
9901-
| ir.cpp:2098:6:2098:24 | SideEffect | ~m2104_9 |
9901+
| ir.cpp:2098:6:2098:24 | SideEffect | ~m2104_8 |
99029902
| ir.cpp:2098:33:2098:33 | Address | &:r2098_5 |
9903-
| ir.cpp:2099:3:2099:12 | Address | &:r2099_7 |
9904-
| ir.cpp:2099:3:2099:12 | Arg(0) | 0:r2099_6 |
9903+
| ir.cpp:2099:3:2099:12 | Address | &:r2099_6 |
9904+
| ir.cpp:2099:3:2099:12 | Arg(0) | 0:r2099_5 |
99059905
| ir.cpp:2099:3:2099:12 | CallTarget | func:r2099_1 |
9906-
| ir.cpp:2099:3:2099:12 | ChiPartial | partial:m2099_8 |
9906+
| ir.cpp:2099:3:2099:12 | ChiPartial | partial:m2099_7 |
99079907
| ir.cpp:2099:3:2099:12 | ChiTotal | total:m2098_4 |
9908-
| ir.cpp:2099:3:2099:12 | Left | r2099_4 |
9909-
| ir.cpp:2099:3:2099:12 | Right | r2099_5 |
9908+
| ir.cpp:2099:3:2099:12 | Right | r2099_4 |
99109909
| ir.cpp:2099:3:2099:12 | SideEffect | ~m2098_4 |
9911-
| ir.cpp:2099:3:2099:12 | Unary | r2099_7 |
9910+
| ir.cpp:2099:3:2099:12 | Unary | r2099_6 |
99129911
| ir.cpp:2099:11:2099:11 | Address | &:r2099_2 |
9912+
| ir.cpp:2099:11:2099:11 | Left | r2099_3 |
99139913
| ir.cpp:2099:11:2099:11 | Load | m2098_6 |
9914-
| ir.cpp:2099:11:2099:11 | Unary | r2099_3 |
9915-
| ir.cpp:2100:3:2100:18 | Address | &:r2100_8 |
9916-
| ir.cpp:2100:3:2100:18 | Arg(0) | 0:r2100_6 |
9914+
| ir.cpp:2100:3:2100:18 | Address | &:r2100_7 |
9915+
| ir.cpp:2100:3:2100:18 | Arg(0) | 0:r2100_5 |
99179916
| ir.cpp:2100:3:2100:18 | CallTarget | func:r2100_1 |
9918-
| ir.cpp:2100:3:2100:18 | ChiPartial | partial:m2100_9 |
9919-
| ir.cpp:2100:3:2100:18 | ChiTotal | total:m2099_9 |
9920-
| ir.cpp:2100:3:2100:18 | Left | r2100_4 |
9921-
| ir.cpp:2100:3:2100:18 | Right | r2100_5 |
9922-
| ir.cpp:2100:3:2100:18 | SideEffect | ~m2099_9 |
9923-
| ir.cpp:2100:3:2100:18 | Unary | r2100_8 |
9924-
| ir.cpp:2100:7:2100:10 | Arg(1) | 1:r2100_7 |
9917+
| ir.cpp:2100:3:2100:18 | ChiPartial | partial:m2100_8 |
9918+
| ir.cpp:2100:3:2100:18 | ChiTotal | total:m2099_8 |
9919+
| ir.cpp:2100:3:2100:18 | Right | r2100_4 |
9920+
| ir.cpp:2100:3:2100:18 | SideEffect | ~m2099_8 |
9921+
| ir.cpp:2100:3:2100:18 | Unary | r2100_7 |
9922+
| ir.cpp:2100:7:2100:10 | Arg(1) | 1:r2100_6 |
99259923
| ir.cpp:2100:17:2100:17 | Address | &:r2100_2 |
9924+
| ir.cpp:2100:17:2100:17 | Left | r2100_3 |
99269925
| ir.cpp:2100:17:2100:17 | Load | m2098_6 |
9927-
| ir.cpp:2100:17:2100:17 | Unary | r2100_3 |
9928-
| ir.cpp:2101:3:2101:15 | Address | &:r2101_7 |
9929-
| ir.cpp:2101:3:2101:15 | Arg(0) | 0:r2101_6 |
9926+
| ir.cpp:2101:3:2101:15 | Address | &:r2101_6 |
9927+
| ir.cpp:2101:3:2101:15 | Arg(0) | 0:r2101_5 |
99309928
| ir.cpp:2101:3:2101:15 | CallTarget | func:r2101_1 |
9931-
| ir.cpp:2101:3:2101:15 | ChiPartial | partial:m2101_8 |
9932-
| ir.cpp:2101:3:2101:15 | ChiTotal | total:m2100_10 |
9933-
| ir.cpp:2101:3:2101:15 | Left | r2101_4 |
9934-
| ir.cpp:2101:3:2101:15 | Right | r2101_5 |
9935-
| ir.cpp:2101:3:2101:15 | SideEffect | ~m2100_10 |
9936-
| ir.cpp:2101:3:2101:15 | Unary | r2101_7 |
9929+
| ir.cpp:2101:3:2101:15 | ChiPartial | partial:m2101_7 |
9930+
| ir.cpp:2101:3:2101:15 | ChiTotal | total:m2100_9 |
9931+
| ir.cpp:2101:3:2101:15 | Right | r2101_4 |
9932+
| ir.cpp:2101:3:2101:15 | SideEffect | ~m2100_9 |
9933+
| ir.cpp:2101:3:2101:15 | Unary | r2101_6 |
99379934
| ir.cpp:2101:14:2101:14 | Address | &:r2101_2 |
9935+
| ir.cpp:2101:14:2101:14 | Left | r2101_3 |
99389936
| ir.cpp:2101:14:2101:14 | Load | m2098_6 |
9939-
| ir.cpp:2101:14:2101:14 | Unary | r2101_3 |
9940-
| ir.cpp:2102:3:2102:20 | Address | &:r2102_8 |
9941-
| ir.cpp:2102:3:2102:20 | Arg(0) | 0:r2102_6 |
9937+
| ir.cpp:2102:3:2102:20 | Address | &:r2102_7 |
9938+
| ir.cpp:2102:3:2102:20 | Arg(0) | 0:r2102_5 |
99429939
| ir.cpp:2102:3:2102:20 | CallTarget | func:r2102_1 |
9943-
| ir.cpp:2102:3:2102:20 | ChiPartial | partial:m2102_9 |
9944-
| ir.cpp:2102:3:2102:20 | ChiTotal | total:m2101_9 |
9945-
| ir.cpp:2102:3:2102:20 | Left | r2102_4 |
9946-
| ir.cpp:2102:3:2102:20 | Right | r2102_5 |
9947-
| ir.cpp:2102:3:2102:20 | SideEffect | ~m2101_9 |
9948-
| ir.cpp:2102:3:2102:20 | Unary | r2102_8 |
9940+
| ir.cpp:2102:3:2102:20 | ChiPartial | partial:m2102_8 |
9941+
| ir.cpp:2102:3:2102:20 | ChiTotal | total:m2101_8 |
9942+
| ir.cpp:2102:3:2102:20 | Right | r2102_4 |
9943+
| ir.cpp:2102:3:2102:20 | SideEffect | ~m2101_8 |
9944+
| ir.cpp:2102:3:2102:20 | Unary | r2102_7 |
99499945
| ir.cpp:2102:19:2102:19 | Address | &:r2102_2 |
9946+
| ir.cpp:2102:19:2102:19 | Left | r2102_3 |
99509947
| ir.cpp:2102:19:2102:19 | Load | m2098_6 |
9951-
| ir.cpp:2102:19:2102:19 | Unary | r2102_3 |
9952-
| ir.cpp:2102:21:2102:21 | Arg(1) | 1:r2102_7 |
9953-
| ir.cpp:2103:3:2103:36 | Address | &:r2103_7 |
9954-
| ir.cpp:2103:3:2103:36 | Arg(0) | 0:r2103_6 |
9948+
| ir.cpp:2102:21:2102:21 | Arg(1) | 1:r2102_6 |
9949+
| ir.cpp:2103:3:2103:36 | Address | &:r2103_6 |
9950+
| ir.cpp:2103:3:2103:36 | Arg(0) | 0:r2103_5 |
99559951
| ir.cpp:2103:3:2103:36 | CallTarget | func:r2103_1 |
9956-
| ir.cpp:2103:3:2103:36 | ChiPartial | partial:m2103_8 |
9957-
| ir.cpp:2103:3:2103:36 | ChiTotal | total:m2102_10 |
9958-
| ir.cpp:2103:3:2103:36 | Left | r2103_4 |
9959-
| ir.cpp:2103:3:2103:36 | Right | r2103_5 |
9960-
| ir.cpp:2103:3:2103:36 | SideEffect | ~m2102_10 |
9961-
| ir.cpp:2103:3:2103:36 | Unary | r2103_7 |
9952+
| ir.cpp:2103:3:2103:36 | ChiPartial | partial:m2103_7 |
9953+
| ir.cpp:2103:3:2103:36 | ChiTotal | total:m2102_9 |
9954+
| ir.cpp:2103:3:2103:36 | Right | r2103_4 |
9955+
| ir.cpp:2103:3:2103:36 | SideEffect | ~m2102_9 |
9956+
| ir.cpp:2103:3:2103:36 | Unary | r2103_6 |
99629957
| ir.cpp:2103:35:2103:35 | Address | &:r2103_2 |
9958+
| ir.cpp:2103:35:2103:35 | Left | r2103_3 |
99639959
| ir.cpp:2103:35:2103:35 | Load | m2098_6 |
9964-
| ir.cpp:2103:35:2103:35 | Unary | r2103_3 |
9965-
| ir.cpp:2104:3:2104:24 | Address | &:r2104_7 |
9966-
| ir.cpp:2104:3:2104:24 | Arg(0) | 0:r2104_6 |
9960+
| ir.cpp:2104:3:2104:24 | Address | &:r2104_6 |
9961+
| ir.cpp:2104:3:2104:24 | Arg(0) | 0:r2104_5 |
99679962
| ir.cpp:2104:3:2104:24 | CallTarget | func:r2104_1 |
9968-
| ir.cpp:2104:3:2104:24 | ChiPartial | partial:m2104_8 |
9969-
| ir.cpp:2104:3:2104:24 | ChiTotal | total:m2103_9 |
9970-
| ir.cpp:2104:3:2104:24 | Left | r2104_4 |
9971-
| ir.cpp:2104:3:2104:24 | Right | r2104_5 |
9972-
| ir.cpp:2104:3:2104:24 | SideEffect | ~m2103_9 |
9973-
| ir.cpp:2104:3:2104:24 | Unary | r2104_7 |
9963+
| ir.cpp:2104:3:2104:24 | ChiPartial | partial:m2104_7 |
9964+
| ir.cpp:2104:3:2104:24 | ChiTotal | total:m2103_8 |
9965+
| ir.cpp:2104:3:2104:24 | Right | r2104_4 |
9966+
| ir.cpp:2104:3:2104:24 | SideEffect | ~m2103_8 |
9967+
| ir.cpp:2104:3:2104:24 | Unary | r2104_6 |
99749968
| ir.cpp:2104:11:2104:11 | Address | &:r2104_2 |
9969+
| ir.cpp:2104:11:2104:11 | Left | r2104_3 |
99759970
| ir.cpp:2104:11:2104:11 | Load | m2098_6 |
9976-
| ir.cpp:2104:11:2104:11 | Unary | r2104_3 |
99779971
| perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
99789972
| perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
99799973
| perf-regression.cpp:6:3:6:5 | Address | &:r6_7 |

0 commit comments

Comments
 (0)