Skip to content

Commit 3f03cc2

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent 648c08b commit 3f03cc2

7 files changed

+33
-65
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ unexplainedLoop
1111
unnecessaryPhiInstruction
1212
memoryOperandDefinitionIsUnmodeled
1313
operandAcrossFunctions
14-
| ir.cpp:1232:16:1232:16 | Address | Operand 'Address' is used on instruction 'Store: 0' in function '$@', but is defined on instruction 'VariableAddress: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
15-
| ir.cpp:1232:16:1232:16 | SideEffect | Operand 'SideEffect' is used on instruction 'AliasedUse: a' in function '$@', but is defined on instruction 'Chi: 0' in function '$@'. | ir.cpp:1232:16:1232:16 | int a | int a | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) |
16-
| ir.cpp:1232:20:1232:20 | ChiTotal | Operand 'ChiTotal' is used on instruction 'Chi: 0' in function '$@', but is defined on instruction 'AliasedDefinition: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
17-
| ir.cpp:1233:16:1233:16 | Address | Operand 'Address' is used on instruction 'Store: (int)...' in function '$@', but is defined on instruction 'VariableAddress: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
18-
| ir.cpp:1233:16:1233:16 | SideEffect | Operand 'SideEffect' is used on instruction 'AliasedUse: b' in function '$@', but is defined on instruction 'Chi: (int)...' in function '$@'. | ir.cpp:1233:16:1233:16 | int b | int b | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) |
19-
| ir.cpp:1233:20:1233:28 | ChiTotal | Operand 'ChiTotal' is used on instruction 'Chi: (int)...' in function '$@', but is defined on instruction 'AliasedDefinition: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
20-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
21-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
22-
| struct_init.cpp:21:17:21:28 | SideEffect | Operand 'SideEffect' is used on instruction 'AliasedUse: static_infos' in function '$@', but is defined on instruction 'Chi: & ...' in function '$@'. | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() |
23-
| struct_init.cpp:22:11:22:13 | ChiTotal | Operand 'ChiTotal' is used on instruction 'Chi: array to pointer conversion' in function '$@', but is defined on instruction 'AliasedDefinition: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
2414
instructionWithoutUniqueBlock
2515
containsLoopOfForwardEdges
2616
lostReachability

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ unexplainedLoop
1111
unnecessaryPhiInstruction
1212
memoryOperandDefinitionIsUnmodeled
1313
operandAcrossFunctions
14-
| ir.cpp:1232:16:1232:16 | Address | Operand 'Address' is used on instruction 'Store: 0' in function '$@', but is defined on instruction 'VariableAddress: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
15-
| ir.cpp:1232:16:1232:16 | SideEffect | Operand 'SideEffect' is used on instruction 'AliasedUse: a' in function '$@', but is defined on instruction 'Chi: 0' in function '$@'. | ir.cpp:1232:16:1232:16 | int a | int a | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) |
16-
| ir.cpp:1232:20:1232:20 | ChiTotal | Operand 'ChiTotal' is used on instruction 'Chi: 0' in function '$@', but is defined on instruction 'AliasedDefinition: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
17-
| ir.cpp:1233:16:1233:16 | Address | Operand 'Address' is used on instruction 'Store: (int)...' in function '$@', but is defined on instruction 'VariableAddress: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
18-
| ir.cpp:1233:16:1233:16 | SideEffect | Operand 'SideEffect' is used on instruction 'AliasedUse: b' in function '$@', but is defined on instruction 'Chi: (int)...' in function '$@'. | ir.cpp:1233:16:1233:16 | int b | int b | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) |
19-
| ir.cpp:1233:20:1233:28 | ChiTotal | Operand 'ChiTotal' is used on instruction 'Chi: (int)...' in function '$@', but is defined on instruction 'AliasedDefinition: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
20-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
21-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
22-
| struct_init.cpp:21:17:21:28 | SideEffect | Operand 'SideEffect' is used on instruction 'AliasedUse: static_infos' in function '$@', but is defined on instruction 'Chi: & ...' in function '$@'. | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() |
23-
| struct_init.cpp:22:11:22:13 | ChiTotal | Operand 'ChiTotal' is used on instruction 'Chi: array to pointer conversion' in function '$@', but is defined on instruction 'AliasedDefinition: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
2414
instructionWithoutUniqueBlock
2515
containsLoopOfForwardEdges
2616
lostReachability

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5755,15 +5755,15 @@
57555755
| ir.cpp:1231:5:1231:19 | SideEffect | ~m1237_2 |
57565756
| ir.cpp:1231:25:1231:25 | Address | &:r1231_5 |
57575757
| ir.cpp:1232:16:1232:16 | Address | &:r1232_3 |
5758-
| ir.cpp:1232:16:1232:16 | SideEffect | ~m1232_3 |
5759-
| ir.cpp:1232:20:1232:20 | ChiPartial | partial:m1232_2 |
5758+
| ir.cpp:1232:16:1232:16 | SideEffect | ~m1232_6 |
5759+
| ir.cpp:1232:20:1232:20 | ChiPartial | partial:m1232_5 |
57605760
| ir.cpp:1232:20:1232:20 | ChiTotal | total:m1232_2 |
5761-
| ir.cpp:1232:20:1232:20 | StoreValue | r1232_1 |
5761+
| ir.cpp:1232:20:1232:20 | StoreValue | r1232_4 |
57625762
| ir.cpp:1233:16:1233:16 | Address | &:r1233_3 |
5763-
| ir.cpp:1233:16:1233:16 | SideEffect | ~m1233_3 |
5764-
| ir.cpp:1233:20:1233:28 | ChiPartial | partial:m1233_2 |
5763+
| ir.cpp:1233:16:1233:16 | SideEffect | ~m1233_6 |
5764+
| ir.cpp:1233:20:1233:28 | ChiPartial | partial:m1233_5 |
57655765
| ir.cpp:1233:20:1233:28 | ChiTotal | total:m1233_2 |
5766-
| ir.cpp:1233:20:1233:28 | StoreValue | r1233_1 |
5766+
| ir.cpp:1233:20:1233:28 | StoreValue | r1233_4 |
57675767
| ir.cpp:1234:16:1234:16 | Address | &:r1234_1 |
57685768
| ir.cpp:1234:16:1234:16 | Address | &:r1234_1 |
57695769
| ir.cpp:1234:16:1234:16 | Address | &:r1234_4 |
@@ -9043,12 +9043,12 @@
90439043
| struct_init.cpp:21:17:21:28 | Left | r21_3 |
90449044
| struct_init.cpp:21:17:21:28 | Left | r21_3 |
90459045
| struct_init.cpp:21:17:21:28 | SideEffect | ~m23_10 |
9046-
| struct_init.cpp:21:34:24:5 | Right | r21_1 |
9047-
| struct_init.cpp:21:34:24:5 | Right | r21_3 |
9048-
| struct_init.cpp:21:34:24:5 | Unary | r21_2 |
9049-
| struct_init.cpp:21:34:24:5 | Unary | r21_2 |
9050-
| struct_init.cpp:21:34:24:5 | Unary | r21_4 |
9051-
| struct_init.cpp:21:34:24:5 | Unary | r21_4 |
9046+
| struct_init.cpp:21:34:24:5 | Right | r21_4 |
9047+
| struct_init.cpp:21:34:24:5 | Right | r21_6 |
9048+
| struct_init.cpp:21:34:24:5 | Unary | r21_5 |
9049+
| struct_init.cpp:21:34:24:5 | Unary | r21_5 |
9050+
| struct_init.cpp:21:34:24:5 | Unary | r21_7 |
9051+
| struct_init.cpp:21:34:24:5 | Unary | r21_7 |
90529052
| struct_init.cpp:22:9:22:25 | Address | &:r22_1 |
90539053
| struct_init.cpp:22:9:22:25 | Address | &:r22_6 |
90549054
| struct_init.cpp:22:11:22:13 | ChiPartial | partial:m22_4 |

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ unexplainedLoop
1111
unnecessaryPhiInstruction
1212
memoryOperandDefinitionIsUnmodeled
1313
operandAcrossFunctions
14-
| ir.cpp:1232:16:1232:16 | Address | Operand 'Address' is used on instruction 'Store: 0' in function '$@', but is defined on instruction 'VariableAddress: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
15-
| ir.cpp:1233:16:1233:16 | Address | Operand 'Address' is used on instruction 'Store: (int)...' in function '$@', but is defined on instruction 'VariableAddress: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
16-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
17-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
1814
instructionWithoutUniqueBlock
1915
containsLoopOfForwardEdges
2016
lostReachability

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6846,22 +6846,22 @@ ir.cpp:
68466846
# 1232| v1232_1(void) = EnterFunction :
68476847
# 1232| mu1232_2(unknown) = AliasedDefinition :
68486848
# 1232| r1232_3(glval<int>) = VariableAddress[a] :
6849-
# 1232| r1232_1(int) = Constant[0] :
6850-
# 1232| mu1232_2(int) = Store[a] : &:r1232_3, r1232_1
6851-
# 1232| v1232_4(void) = ReturnVoid :
6852-
# 1232| v1232_5(void) = AliasedUse : ~m?
6853-
# 1232| v1232_6(void) = ExitFunction :
6849+
# 1232| r1232_4(int) = Constant[0] :
6850+
# 1232| mu1232_5(int) = Store[a] : &:r1232_3, r1232_4
6851+
# 1232| v1232_6(void) = ReturnVoid :
6852+
# 1232| v1232_7(void) = AliasedUse : ~m?
6853+
# 1232| v1232_8(void) = ExitFunction :
68546854

68556855
# 1233| int b
68566856
# 1233| Block 0
68576857
# 1233| v1233_1(void) = EnterFunction :
68586858
# 1233| mu1233_2(unknown) = AliasedDefinition :
68596859
# 1233| r1233_3(glval<int>) = VariableAddress[b] :
6860-
# 1233| r1233_1(int) = Constant[4] :
6861-
# 1233| mu1233_2(int) = Store[b] : &:r1233_3, r1233_1
6862-
# 1233| v1233_4(void) = ReturnVoid :
6863-
# 1233| v1233_5(void) = AliasedUse : ~m?
6864-
# 1233| v1233_6(void) = ExitFunction :
6860+
# 1233| r1233_4(int) = Constant[4] :
6861+
# 1233| mu1233_5(int) = Store[b] : &:r1233_3, r1233_4
6862+
# 1233| v1233_6(void) = ReturnVoid :
6863+
# 1233| v1233_7(void) = AliasedUse : ~m?
6864+
# 1233| v1233_8(void) = ExitFunction :
68656865

68666866
# 1240| void staticLocalWithConstructor(char const*)
68676867
# 1240| Block 0
@@ -10347,28 +10347,28 @@ struct_init.cpp:
1034710347
# 21| v21_1(void) = EnterFunction :
1034810348
# 21| mu21_2(unknown) = AliasedDefinition :
1034910349
# 21| r21_3(glval<Info[]>) = VariableAddress[static_infos] :
10350-
# 21| r21_1(int) = Constant[0] :
10351-
# 21| r21_2(glval<Info>) = PointerAdd[16] : r21_3, r21_1
10352-
# 22| r22_1(glval<char *>) = FieldAddress[name] : r21_2
10350+
# 21| r21_4(int) = Constant[0] :
10351+
# 21| r21_5(glval<Info>) = PointerAdd[16] : r21_3, r21_4
10352+
# 22| r22_1(glval<char *>) = FieldAddress[name] : r21_5
1035310353
# 22| r22_2(glval<char[2]>) = StringConstant["1"] :
1035410354
# 22| r22_3(char *) = Convert : r22_2
1035510355
# 22| mu22_4(char *) = Store[?] : &:r22_1, r22_3
10356-
# 22| r22_5(glval<..(*)(..)>) = FieldAddress[handler] : r21_2
10356+
# 22| r22_5(glval<..(*)(..)>) = FieldAddress[handler] : r21_5
1035710357
# 22| r22_6(..(*)(..)) = FunctionAddress[handler1] :
1035810358
# 22| mu22_7(..(*)(..)) = Store[?] : &:r22_5, r22_6
10359-
# 21| r21_3(int) = Constant[1] :
10360-
# 21| r21_4(glval<Info>) = PointerAdd[16] : r21_3, r21_3
10361-
# 23| r23_1(glval<char *>) = FieldAddress[name] : r21_4
10359+
# 21| r21_6(int) = Constant[1] :
10360+
# 21| r21_7(glval<Info>) = PointerAdd[16] : r21_3, r21_6
10361+
# 23| r23_1(glval<char *>) = FieldAddress[name] : r21_7
1036210362
# 23| r23_2(glval<char[2]>) = StringConstant["2"] :
1036310363
# 23| r23_3(char *) = Convert : r23_2
1036410364
# 23| mu23_4(char *) = Store[?] : &:r23_1, r23_3
10365-
# 23| r23_5(glval<..(*)(..)>) = FieldAddress[handler] : r21_4
10365+
# 23| r23_5(glval<..(*)(..)>) = FieldAddress[handler] : r21_7
1036610366
# 23| r23_6(glval<..()(..)>) = FunctionAddress[handler2] :
1036710367
# 23| r23_7(..(*)(..)) = CopyValue : r23_6
1036810368
# 23| mu23_8(..(*)(..)) = Store[?] : &:r23_5, r23_7
10369-
# 21| v21_4(void) = ReturnVoid :
10370-
# 21| v21_5(void) = AliasedUse : ~m?
10371-
# 21| v21_6(void) = ExitFunction :
10369+
# 21| v21_8(void) = ReturnVoid :
10370+
# 21| v21_9(void) = AliasedUse : ~m?
10371+
# 21| v21_10(void) = ExitFunction :
1037210372

1037310373
# 28| void declare_local_infos()
1037410374
# 28| Block 0

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ unexplainedLoop
1111
unnecessaryPhiInstruction
1212
memoryOperandDefinitionIsUnmodeled
1313
operandAcrossFunctions
14-
| ir.cpp:1232:16:1232:16 | Address | Operand 'Address' is used on instruction 'Store: 0' in function '$@', but is defined on instruction 'VariableAddress: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
15-
| ir.cpp:1233:16:1233:16 | Address | Operand 'Address' is used on instruction 'Store: (int)...' in function '$@', but is defined on instruction 'VariableAddress: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
16-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
17-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
1814
instructionWithoutUniqueBlock
1915
containsLoopOfForwardEdges
2016
lostReachability

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ unexplainedLoop
1111
unnecessaryPhiInstruction
1212
memoryOperandDefinitionIsUnmodeled
1313
operandAcrossFunctions
14-
| ir.cpp:1232:16:1232:16 | Address | Operand 'Address' is used on instruction 'Store: 0' in function '$@', but is defined on instruction 'VariableAddress: a' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1232:16:1232:16 | int a | int a |
15-
| ir.cpp:1233:16:1233:16 | Address | Operand 'Address' is used on instruction 'Store: (int)...' in function '$@', but is defined on instruction 'VariableAddress: b' in function '$@'. | ir.cpp:1231:5:1231:19 | int staticLocalInit(int) | int staticLocalInit(int) | ir.cpp:1233:16:1233:16 | int b | int b |
16-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
17-
| struct_init.cpp:21:17:21:28 | Left | Operand 'Left' is used on instruction 'PointerAdd: {...}' in function '$@', but is defined on instruction 'VariableAddress: static_infos' in function '$@'. | struct_init.cpp:20:6:20:25 | void declare_static_infos() | void declare_static_infos() | struct_init.cpp:21:17:21:28 | Info[] static_infos | Info[] static_infos |
1814
instructionWithoutUniqueBlock
1915
containsLoopOfForwardEdges
2016
lostReachability

0 commit comments

Comments
 (0)