Skip to content

Commit 3e1359b

Browse files
committed
C++: Accept test changes.
1 parent 4c4d241 commit 3e1359b

7 files changed

+536
-524
lines changed

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,14 @@ coroutines.cpp:
747747
# 87| m87_4(unknown) = Chi : total:m87_2, partial:m87_3
748748
# 87| r87_5(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
749749
# 87| m87_6(promise_type) = Uninitialized[(unnamed local variable)] : &:r87_5
750+
# 87| r87_7(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
751+
# 87| r87_8(glval<unknown>) = FunctionAddress[initial_suspend] :
752+
# 87| r87_9(suspend_always) = Call[initial_suspend] : func:r87_8, this:r87_7
753+
# 87| m87_10(unknown) = ^CallSideEffect : ~m87_4
754+
# 87| m87_11(unknown) = Chi : total:m87_4, partial:m87_10
755+
# 87| v87_12(void) = ^IndirectReadSideEffect[-1] : &:r87_7, m87_6
756+
# 87| m87_13(promise_type) = ^IndirectMayWriteSideEffect[-1] : &:r87_7
757+
# 87| m87_14(promise_type) = Chi : total:m87_6, partial:m87_13
750758

751759
# 91| co_returnable_value co_return_int(int)
752760
# 91| Block 0
@@ -762,6 +770,14 @@ coroutines.cpp:
762770
#-----| m0_4(int) = Store[i] : &:r0_1, r0_3
763771
# 91| r91_7(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
764772
# 91| m91_8(promise_type) = Uninitialized[(unnamed local variable)] : &:r91_7
773+
# 91| r91_9(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
774+
# 91| r91_10(glval<unknown>) = FunctionAddress[initial_suspend] :
775+
# 91| r91_11(suspend_always) = Call[initial_suspend] : func:r91_10, this:r91_9
776+
# 91| m91_12(unknown) = ^CallSideEffect : ~m91_4
777+
# 91| m91_13(unknown) = Chi : total:m91_4, partial:m91_12
778+
# 91| v91_14(void) = ^IndirectReadSideEffect[-1] : &:r91_9, m91_8
779+
# 91| m91_15(promise_type) = ^IndirectMayWriteSideEffect[-1] : &:r91_9
780+
# 91| m91_16(promise_type) = Chi : total:m91_8, partial:m91_15
765781

766782
# 95| co_returnable_void co_yield_value_void(int)
767783
# 95| Block 0
@@ -777,6 +793,14 @@ coroutines.cpp:
777793
#-----| m0_4(int) = Store[i] : &:r0_1, r0_3
778794
# 95| r95_7(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
779795
# 95| m95_8(promise_type) = Uninitialized[(unnamed local variable)] : &:r95_7
796+
# 95| r95_9(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
797+
# 95| r95_10(glval<unknown>) = FunctionAddress[initial_suspend] :
798+
# 95| r95_11(suspend_always) = Call[initial_suspend] : func:r95_10, this:r95_9
799+
# 95| m95_12(unknown) = ^CallSideEffect : ~m95_4
800+
# 95| m95_13(unknown) = Chi : total:m95_4, partial:m95_12
801+
# 95| v95_14(void) = ^IndirectReadSideEffect[-1] : &:r95_9, m95_8
802+
# 95| m95_15(promise_type) = ^IndirectMayWriteSideEffect[-1] : &:r95_9
803+
# 95| m95_16(promise_type) = Chi : total:m95_8, partial:m95_15
780804

781805
# 99| co_returnable_value co_yield_value_value(int)
782806
# 99| Block 0
@@ -792,6 +816,14 @@ coroutines.cpp:
792816
#-----| m0_4(int) = Store[i] : &:r0_1, r0_3
793817
# 99| r99_7(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
794818
# 99| m99_8(promise_type) = Uninitialized[(unnamed local variable)] : &:r99_7
819+
# 99| r99_9(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
820+
# 99| r99_10(glval<unknown>) = FunctionAddress[initial_suspend] :
821+
# 99| r99_11(suspend_always) = Call[initial_suspend] : func:r99_10, this:r99_9
822+
# 99| m99_12(unknown) = ^CallSideEffect : ~m99_4
823+
# 99| m99_13(unknown) = Chi : total:m99_4, partial:m99_12
824+
# 99| v99_14(void) = ^IndirectReadSideEffect[-1] : &:r99_9, m99_8
825+
# 99| m99_15(promise_type) = ^IndirectMayWriteSideEffect[-1] : &:r99_9
826+
# 99| m99_16(promise_type) = Chi : total:m99_8, partial:m99_15
795827

796828
# 103| co_returnable_void co_yield_and_return_void(int)
797829
# 103| Block 0
@@ -807,6 +839,14 @@ coroutines.cpp:
807839
#-----| m0_4(int) = Store[i] : &:r0_1, r0_3
808840
# 103| r103_7(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
809841
# 103| m103_8(promise_type) = Uninitialized[(unnamed local variable)] : &:r103_7
842+
# 103| r103_9(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
843+
# 103| r103_10(glval<unknown>) = FunctionAddress[initial_suspend] :
844+
# 103| r103_11(suspend_always) = Call[initial_suspend] : func:r103_10, this:r103_9
845+
# 103| m103_12(unknown) = ^CallSideEffect : ~m103_4
846+
# 103| m103_13(unknown) = Chi : total:m103_4, partial:m103_12
847+
# 103| v103_14(void) = ^IndirectReadSideEffect[-1] : &:r103_9, m103_8
848+
# 103| m103_15(promise_type) = ^IndirectMayWriteSideEffect[-1] : &:r103_9
849+
# 103| m103_16(promise_type) = Chi : total:m103_8, partial:m103_15
810850

811851
# 108| co_returnable_value co_yield_and_return_value(int)
812852
# 108| Block 0
@@ -822,6 +862,14 @@ coroutines.cpp:
822862
#-----| m0_4(int) = Store[i] : &:r0_1, r0_3
823863
# 108| r108_7(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
824864
# 108| m108_8(promise_type) = Uninitialized[(unnamed local variable)] : &:r108_7
865+
# 108| r108_9(glval<promise_type>) = VariableAddress[(unnamed local variable)] :
866+
# 108| r108_10(glval<unknown>) = FunctionAddress[initial_suspend] :
867+
# 108| r108_11(suspend_always) = Call[initial_suspend] : func:r108_10, this:r108_9
868+
# 108| m108_12(unknown) = ^CallSideEffect : ~m108_4
869+
# 108| m108_13(unknown) = Chi : total:m108_4, partial:m108_12
870+
# 108| v108_14(void) = ^IndirectReadSideEffect[-1] : &:r108_9, m108_8
871+
# 108| m108_15(promise_type) = ^IndirectMayWriteSideEffect[-1] : &:r108_9
872+
# 108| m108_16(promise_type) = Chi : total:m108_8, partial:m108_15
825873

826874
destructors_for_temps.cpp:
827875
# 9| void ClassWithConstructor::ClassWithConstructor(ClassWithConstructor&&)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ missingOperandType
66
duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
9-
| coroutines.cpp:87:20:87:20 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:87:20:87:33 | co_returnable_void co_return_void() | co_returnable_void co_return_void() |
10-
| coroutines.cpp:91:21:91:21 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:91:21:91:33 | co_returnable_value co_return_int(int) | co_returnable_value co_return_int(int) |
11-
| coroutines.cpp:95:20:95:20 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:95:20:95:38 | co_returnable_void co_yield_value_void(int) | co_returnable_void co_yield_value_void(int) |
12-
| coroutines.cpp:99:21:99:21 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:99:21:99:40 | co_returnable_value co_yield_value_value(int) | co_returnable_value co_yield_value_value(int) |
13-
| coroutines.cpp:103:20:103:20 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:103:20:103:43 | co_returnable_void co_yield_and_return_void(int) | co_returnable_void co_yield_and_return_void(int) |
14-
| coroutines.cpp:108:21:108:21 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:108:21:108:45 | co_returnable_value co_yield_and_return_value(int) | co_returnable_value co_yield_and_return_value(int) |
9+
| coroutines.cpp:87:20:87:20 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:87:20:87:33 | co_returnable_void co_return_void() | co_returnable_void co_return_void() |
10+
| coroutines.cpp:91:21:91:21 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:91:21:91:33 | co_returnable_value co_return_int(int) | co_returnable_value co_return_int(int) |
11+
| coroutines.cpp:95:20:95:20 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:95:20:95:38 | co_returnable_void co_yield_value_void(int) | co_returnable_void co_yield_value_void(int) |
12+
| coroutines.cpp:99:21:99:21 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:99:21:99:40 | co_returnable_value co_yield_value_value(int) | co_returnable_value co_yield_value_value(int) |
13+
| coroutines.cpp:103:20:103:20 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:103:20:103:43 | co_returnable_void co_yield_and_return_void(int) | co_returnable_void co_yield_and_return_void(int) |
14+
| coroutines.cpp:108:21:108:21 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:108:21:108:45 | co_returnable_value co_yield_and_return_value(int) | co_returnable_value co_yield_and_return_value(int) |
1515
ambiguousSuccessors
1616
unexplainedLoop
1717
unnecessaryPhiInstruction

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ missingOperandType
66
duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
9-
| coroutines.cpp:87:20:87:20 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:87:20:87:33 | co_returnable_void co_return_void() | co_returnable_void co_return_void() |
10-
| coroutines.cpp:91:21:91:21 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:91:21:91:33 | co_returnable_value co_return_int(int) | co_returnable_value co_return_int(int) |
11-
| coroutines.cpp:95:20:95:20 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:95:20:95:38 | co_returnable_void co_yield_value_void(int) | co_returnable_void co_yield_value_void(int) |
12-
| coroutines.cpp:99:21:99:21 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:99:21:99:40 | co_returnable_value co_yield_value_value(int) | co_returnable_value co_yield_value_value(int) |
13-
| coroutines.cpp:103:20:103:20 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:103:20:103:43 | co_returnable_void co_yield_and_return_void(int) | co_returnable_void co_yield_and_return_void(int) |
14-
| coroutines.cpp:108:21:108:21 | Uninitialized: declaration of (unnamed local variable) | Instruction 'Uninitialized: declaration of (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:108:21:108:45 | co_returnable_value co_yield_and_return_value(int) | co_returnable_value co_yield_and_return_value(int) |
9+
| coroutines.cpp:87:20:87:20 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:87:20:87:33 | co_returnable_void co_return_void() | co_returnable_void co_return_void() |
10+
| coroutines.cpp:91:21:91:21 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:91:21:91:33 | co_returnable_value co_return_int(int) | co_returnable_value co_return_int(int) |
11+
| coroutines.cpp:95:20:95:20 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:95:20:95:38 | co_returnable_void co_yield_value_void(int) | co_returnable_void co_yield_value_void(int) |
12+
| coroutines.cpp:99:21:99:21 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:99:21:99:40 | co_returnable_value co_yield_value_value(int) | co_returnable_value co_yield_value_value(int) |
13+
| coroutines.cpp:103:20:103:20 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:103:20:103:43 | co_returnable_void co_yield_and_return_void(int) | co_returnable_void co_yield_and_return_void(int) |
14+
| coroutines.cpp:108:21:108:21 | Chi: (unnamed local variable) | Instruction 'Chi: (unnamed local variable)' has no successors in function '$@'. | coroutines.cpp:108:21:108:45 | co_returnable_value co_yield_and_return_value(int) | co_returnable_value co_yield_and_return_value(int) |
1515
ambiguousSuccessors
1616
unexplainedLoop
1717
unnecessaryPhiInstruction

0 commit comments

Comments
 (0)