Skip to content

Commit 8f11cb6

Browse files
committed
C++: Accept test changes.
1 parent 1808886 commit 8f11cb6

8 files changed

+59
-47
lines changed

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

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15903,21 +15903,32 @@ ir.cpp:
1590315903

1590415904
# 2434| void rethrow_with_destruction(int)
1590515905
# 2434| Block 0
15906-
# 2434| v2434_1(void) = EnterFunction :
15907-
# 2434| m2434_2(unknown) = AliasedDefinition :
15908-
# 2434| m2434_3(unknown) = InitializeNonLocal :
15909-
# 2434| m2434_4(unknown) = Chi : total:m2434_2, partial:m2434_3
15910-
# 2434| r2434_5(glval<int>) = VariableAddress[x] :
15911-
# 2434| m2434_6(int) = InitializeParameter[x] : &:r2434_5
15912-
# 2435| r2435_1(glval<ClassWithDestructor>) = VariableAddress[c] :
15913-
# 2435| m2435_2(ClassWithDestructor) = Uninitialized[c] : &:r2435_1
15914-
# 2435| r2435_3(glval<unknown>) = FunctionAddress[ClassWithDestructor] :
15915-
# 2435| v2435_4(void) = Call[ClassWithDestructor] : func:r2435_3, this:r2435_1
15916-
# 2435| m2435_5(unknown) = ^CallSideEffect : ~m2434_4
15917-
# 2435| m2435_6(unknown) = Chi : total:m2434_4, partial:m2435_5
15918-
# 2435| m2435_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2435_1
15919-
# 2435| m2435_8(ClassWithDestructor) = Chi : total:m2435_2, partial:m2435_7
15920-
# 2436| v2436_1(void) = ReThrow :
15906+
# 2434| v2434_1(void) = EnterFunction :
15907+
# 2434| m2434_2(unknown) = AliasedDefinition :
15908+
# 2434| m2434_3(unknown) = InitializeNonLocal :
15909+
# 2434| m2434_4(unknown) = Chi : total:m2434_2, partial:m2434_3
15910+
# 2434| r2434_5(glval<int>) = VariableAddress[x] :
15911+
# 2434| m2434_6(int) = InitializeParameter[x] : &:r2434_5
15912+
# 2435| r2435_1(glval<ClassWithDestructor>) = VariableAddress[c] :
15913+
# 2435| m2435_2(ClassWithDestructor) = Uninitialized[c] : &:r2435_1
15914+
# 2435| r2435_3(glval<unknown>) = FunctionAddress[ClassWithDestructor] :
15915+
# 2435| v2435_4(void) = Call[ClassWithDestructor] : func:r2435_3, this:r2435_1
15916+
# 2435| m2435_5(unknown) = ^CallSideEffect : ~m2434_4
15917+
# 2435| m2435_6(unknown) = Chi : total:m2434_4, partial:m2435_5
15918+
# 2435| m2435_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2435_1
15919+
# 2435| m2435_8(ClassWithDestructor) = Chi : total:m2435_2, partial:m2435_7
15920+
# 2436| v2436_1(void) = ReThrow :
15921+
# 2437| r2437_1(glval<ClassWithDestructor>) = VariableAddress[c] :
15922+
# 2437| r2437_2(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
15923+
# 2437| v2437_3(void) = Call[~ClassWithDestructor] : func:r2437_2, this:r2437_1
15924+
# 2437| m2437_4(unknown) = ^CallSideEffect : ~m2435_6
15925+
# 2437| m2437_5(unknown) = Chi : total:m2435_6, partial:m2437_4
15926+
# 2437| v2437_6(void) = ^IndirectReadSideEffect[-1] : &:r2437_1, m2435_8
15927+
# 2437| m2437_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2437_1
15928+
# 2437| m2437_8(ClassWithDestructor) = Chi : total:m2435_8, partial:m2437_7
15929+
# 2434| v2434_7(void) = ReturnVoid :
15930+
# 2434| v2434_8(void) = AliasedUse : ~m2437_5
15931+
# 2434| v2434_9(void) = ExitFunction :
1592115932

1592215933
perf-regression.cpp:
1592315934
# 6| void Big::Big()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ missingOperandType
66
duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
9-
| ir.cpp:2436:5:2436:9 | ReThrow: re-throw exception | Instruction 'ReThrow: re-throw exception ' has no successors in function '$@'. | ir.cpp:2434:6:2434:29 | void rethrow_with_destruction(int) | void rethrow_with_destruction(int) |
109
ambiguousSuccessors
1110
unexplainedLoop
1211
unnecessaryPhiInstruction

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ missingOperandType
99
duplicateChiOperand
1010
sideEffectWithoutPrimary
1111
instructionWithoutSuccessor
12-
| ir.cpp:2436:5:2436:9 | ReThrow: re-throw exception | Instruction 'ReThrow: re-throw exception ' has no successors in function '$@'. | ir.cpp:2434:6:2434:29 | void rethrow_with_destruction(int) | void rethrow_with_destruction(int) |
1312
ambiguousSuccessors
1413
unexplainedLoop
1514
unnecessaryPhiInstruction

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13369,6 +13369,7 @@
1336913369
| ir.cpp:2431:14:2431:14 | Unary | r2431_2 |
1337013370
| ir.cpp:2434:6:2434:29 | ChiPartial | partial:m2434_3 |
1337113371
| ir.cpp:2434:6:2434:29 | ChiTotal | total:m2434_2 |
13372+
| ir.cpp:2434:6:2434:29 | SideEffect | ~m2437_5 |
1337213373
| ir.cpp:2434:35:2434:35 | Address | &:r2434_5 |
1337313374
| ir.cpp:2435:25:2435:25 | Address | &:r2435_1 |
1337413375
| ir.cpp:2435:25:2435:25 | Address | &:r2435_1 |
@@ -13379,6 +13380,16 @@
1337913380
| ir.cpp:2435:25:2435:25 | ChiTotal | total:m2434_4 |
1338013381
| ir.cpp:2435:25:2435:25 | ChiTotal | total:m2435_2 |
1338113382
| ir.cpp:2435:25:2435:25 | SideEffect | ~m2434_4 |
13383+
| ir.cpp:2437:1:2437:1 | Address | &:r2437_1 |
13384+
| ir.cpp:2437:1:2437:1 | Address | &:r2437_1 |
13385+
| ir.cpp:2437:1:2437:1 | Arg(this) | this:r2437_1 |
13386+
| ir.cpp:2437:1:2437:1 | CallTarget | func:r2437_2 |
13387+
| ir.cpp:2437:1:2437:1 | ChiPartial | partial:m2437_4 |
13388+
| ir.cpp:2437:1:2437:1 | ChiPartial | partial:m2437_7 |
13389+
| ir.cpp:2437:1:2437:1 | ChiTotal | total:m2435_6 |
13390+
| ir.cpp:2437:1:2437:1 | ChiTotal | total:m2435_8 |
13391+
| ir.cpp:2437:1:2437:1 | SideEffect | m2435_8 |
13392+
| ir.cpp:2437:1:2437:1 | SideEffect | ~m2435_6 |
1338213393
| perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
1338313394
| perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
1338413395
| perf-regression.cpp:6:3:6:5 | Address | &:r6_7 |

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ missingOperandType
66
duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
9-
| ir.cpp:2436:5:2436:9 | ReThrow: re-throw exception | Instruction 'ReThrow: re-throw exception ' has no successors in function '$@'. | ir.cpp:2434:6:2434:29 | void rethrow_with_destruction(int) | void rethrow_with_destruction(int) |
10-
| ir.cpp:2437:1:2437:1 | IndirectMayWriteSideEffect: c | Instruction 'IndirectMayWriteSideEffect: c' has no successors in function '$@'. | ir.cpp:2434:6:2434:29 | void rethrow_with_destruction(int) | void rethrow_with_destruction(int) |
119
ambiguousSuccessors
1210
unexplainedLoop
1311
unnecessaryPhiInstruction

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

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14646,38 +14646,34 @@ ir.cpp:
1464614646

1464714647
# 2434| void rethrow_with_destruction(int)
1464814648
# 2434| Block 0
14649-
# 2434| v2434_1(void) = EnterFunction :
14650-
# 2434| mu2434_2(unknown) = AliasedDefinition :
14651-
# 2434| mu2434_3(unknown) = InitializeNonLocal :
14652-
# 2434| r2434_4(glval<int>) = VariableAddress[x] :
14653-
# 2434| mu2434_5(int) = InitializeParameter[x] : &:r2434_4
14654-
# 2435| r2435_1(glval<ClassWithDestructor>) = VariableAddress[c] :
14655-
# 2435| mu2435_2(ClassWithDestructor) = Uninitialized[c] : &:r2435_1
14656-
# 2435| r2435_3(glval<unknown>) = FunctionAddress[ClassWithDestructor] :
14657-
# 2435| v2435_4(void) = Call[ClassWithDestructor] : func:r2435_3, this:r2435_1
14658-
# 2435| mu2435_5(unknown) = ^CallSideEffect : ~m?
14659-
# 2435| mu2435_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2435_1
14660-
# 2436| v2436_1(void) = ReThrow :
14661-
14662-
# 2434| Block 1
14663-
# 2434| v2434_6(void) = AliasedUse : ~m?
14664-
# 2434| v2434_7(void) = ExitFunction :
14665-
14666-
# 2434| Block 2
14667-
# 2434| v2434_8(void) = ReturnVoid :
14668-
#-----| Goto -> Block 1
14669-
14670-
# 2434| Block 3
14671-
# 2434| v2434_9(void) = Unwind :
14672-
#-----| Goto -> Block 1
14673-
14674-
# 2437| Block 4
14649+
# 2434| v2434_1(void) = EnterFunction :
14650+
# 2434| mu2434_2(unknown) = AliasedDefinition :
14651+
# 2434| mu2434_3(unknown) = InitializeNonLocal :
14652+
# 2434| r2434_4(glval<int>) = VariableAddress[x] :
14653+
# 2434| mu2434_5(int) = InitializeParameter[x] : &:r2434_4
14654+
# 2435| r2435_1(glval<ClassWithDestructor>) = VariableAddress[c] :
14655+
# 2435| mu2435_2(ClassWithDestructor) = Uninitialized[c] : &:r2435_1
14656+
# 2435| r2435_3(glval<unknown>) = FunctionAddress[ClassWithDestructor] :
14657+
# 2435| v2435_4(void) = Call[ClassWithDestructor] : func:r2435_3, this:r2435_1
14658+
# 2435| mu2435_5(unknown) = ^CallSideEffect : ~m?
14659+
# 2435| mu2435_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2435_1
14660+
# 2436| v2436_1(void) = ReThrow :
1467514661
# 2437| r2437_1(glval<ClassWithDestructor>) = VariableAddress[c] :
1467614662
# 2437| r2437_2(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1467714663
# 2437| v2437_3(void) = Call[~ClassWithDestructor] : func:r2437_2, this:r2437_1
1467814664
# 2437| mu2437_4(unknown) = ^CallSideEffect : ~m?
1467914665
# 2437| v2437_5(void) = ^IndirectReadSideEffect[-1] : &:r2437_1, ~m?
1468014666
# 2437| mu2437_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2437_1
14667+
# 2434| v2434_6(void) = ReturnVoid :
14668+
#-----| Goto -> Block 1
14669+
14670+
# 2434| Block 1
14671+
# 2434| v2434_7(void) = AliasedUse : ~m?
14672+
# 2434| v2434_8(void) = ExitFunction :
14673+
14674+
# 2434| Block 2
14675+
# 2434| v2434_9(void) = Unwind :
14676+
#-----| Goto -> Block 1
1468114677

1468214678
perf-regression.cpp:
1468314679
# 6| void Big::Big()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ missingOperandType
66
duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
9-
| ir.cpp:2436:5:2436:9 | ReThrow: re-throw exception | Instruction 'ReThrow: re-throw exception ' has no successors in function '$@'. | ir.cpp:2434:6:2434:29 | void rethrow_with_destruction(int) | void rethrow_with_destruction(int) |
109
ambiguousSuccessors
1110
unexplainedLoop
1211
unnecessaryPhiInstruction

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ missingOperandType
66
duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
9-
| ir.cpp:2436:5:2436:9 | ReThrow: re-throw exception | Instruction 'ReThrow: re-throw exception ' has no successors in function '$@'. | ir.cpp:2434:6:2434:29 | void rethrow_with_destruction(int) | void rethrow_with_destruction(int) |
109
ambiguousSuccessors
1110
unexplainedLoop
1211
unnecessaryPhiInstruction

0 commit comments

Comments
 (0)