C++: Accept test changes.

2026-04-20 22:44:52 +02:00 · 2024-02-07 11:45:40 +00:00
parent edc7903c69
commit fe5eca4134
8 changed files with 56 additions and 32 deletions
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -12443,13 +12443,35 @@ ir.cpp:

 # 2119| void call_as_child_of_ConditionDeclExpr()
 # 2119|   Block 0
-# 2119|     v2119_1(void)                   = EnterFunction      : 
-# 2119|     m2119_2(unknown)                = AliasedDefinition  : 
-# 2119|     m2119_3(unknown)                = InitializeNonLocal : 
-# 2119|     m2119_4(unknown)                = Chi                : total:m2119_2, partial:m2119_3
-# 2120|     r2120_1(glval<HasOperatorBool>) = VariableAddress[b] : 
-# 2120|     r2120_2(HasOperatorBool)        = Constant[0]        : 
-# 2120|     m2120_3(HasOperatorBool)        = Store[b]           : &:r2120_1, r2120_2
+# 2119|     v2119_1(void)                   = EnterFunction                   : 
+# 2119|     m2119_2(unknown)                = AliasedDefinition               : 
+# 2119|     m2119_3(unknown)                = InitializeNonLocal              : 
+# 2119|     m2119_4(unknown)                = Chi                             : total:m2119_2, partial:m2119_3
+# 2120|     r2120_1(glval<HasOperatorBool>) = VariableAddress[b]              : 
+# 2120|     r2120_2(HasOperatorBool)        = Constant[0]                     : 
+# 2120|     m2120_3(HasOperatorBool)        = Store[b]                        : &:r2120_1, r2120_2
+# 2120|     r2120_4(glval<HasOperatorBool>) = VariableAddress[b]              : 
+# 2120|     r2120_5(glval<unknown>)         = FunctionAddress[operator bool]  : 
+# 2120|     r2120_6(bool)                   = Call[operator bool]             : func:r2120_5, this:r2120_4
+# 2120|     m2120_7(unknown)                = ^CallSideEffect                 : ~m2119_4
+# 2120|     m2120_8(unknown)                = Chi                             : total:m2119_4, partial:m2120_7
+# 2120|     v2120_9(void)                   = ^IndirectReadSideEffect[-1]     : &:r2120_4, m2120_3
+# 2120|     m2120_10(HasOperatorBool)       = ^IndirectMayWriteSideEffect[-1] : &:r2120_4
+# 2120|     m2120_11(HasOperatorBool)       = Chi                             : total:m2120_3, partial:m2120_10
+# 2120|     r2120_12(bool)                  = CopyValue                       : r2120_6
+# 2120|     v2120_13(void)                  = ConditionalBranch               : r2120_12
+#-----|   False -> Block 2
+#-----|   True -> Block 1
+
+# 2120|   Block 1
+# 2120|     v2120_14(void) = NoOp : 
+#-----|   Goto -> Block 2
+
+# 2121|   Block 2
+# 2121|     v2121_1(void) = NoOp         : 
+# 2119|     v2119_5(void) = ReturnVoid   : 
+# 2119|     v2119_6(void) = AliasedUse   : ~m2120_8
+# 2119|     v2119_7(void) = ExitFunction : 

 perf-regression.cpp:
 #    6| void Big::Big()
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
@@ -6,7 +6,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ir.cpp:2120:25:2120:42 | Store: 0 | Instruction 'Store: 0' has no successors in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
@@ -6,7 +6,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ir.cpp:2120:25:2120:42 | Store: 0 | Instruction 'Store: 0' has no successors in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
--- a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
+++ b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
@@ -10072,7 +10072,20 @@
 | ir.cpp:2112:10:2112:12 | StoreValue | r2112_3 |
 | ir.cpp:2119:6:2119:39 | ChiPartial | partial:m2119_3 |
 | ir.cpp:2119:6:2119:39 | ChiTotal | total:m2119_2 |
+| ir.cpp:2119:6:2119:39 | SideEffect | ~m2120_8 |
 | ir.cpp:2120:6:2120:42 | Address | &:r2120_1 |
+| ir.cpp:2120:6:2120:42 | Condition | r2120_12 |
+| ir.cpp:2120:22:2120:22 | Address | &:r2120_4 |
+| ir.cpp:2120:22:2120:22 | Address | &:r2120_4 |
+| ir.cpp:2120:22:2120:22 | Arg(this) | this:r2120_4 |
+| ir.cpp:2120:22:2120:22 | CallTarget | func:r2120_5 |
+| ir.cpp:2120:22:2120:22 | ChiPartial | partial:m2120_7 |
+| ir.cpp:2120:22:2120:22 | ChiPartial | partial:m2120_10 |
+| ir.cpp:2120:22:2120:22 | ChiTotal | total:m2119_4 |
+| ir.cpp:2120:22:2120:22 | ChiTotal | total:m2120_3 |
+| ir.cpp:2120:22:2120:22 | SideEffect | m2120_3 |
+| ir.cpp:2120:22:2120:22 | SideEffect | ~m2119_4 |
+| ir.cpp:2120:22:2120:22 | Unary | r2120_6 |
 | ir.cpp:2120:25:2120:42 | StoreValue | r2120_2 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
--- a/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected
@@ -1,5 +1,4 @@
 missingOperand
-| ir.cpp:2120:6:2120:42 | CopyValue: (condition decl) | Instruction 'CopyValue' is missing an expected operand with tag 'Unary' in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
 unexpectedOperand
 duplicateOperand
 missingPhiOperand
@@ -7,8 +6,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ir.cpp:2120:22:2120:22 | IndirectMayWriteSideEffect: b | Instruction 'IndirectMayWriteSideEffect: b' has no successors in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
-| ir.cpp:2120:25:2120:42 | Store: 0 | Instruction 'Store: 0' has no successors in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -11649,32 +11649,28 @@ ir.cpp:

 # 2119| void call_as_child_of_ConditionDeclExpr()
 # 2119|   Block 0
-# 2119|     v2119_1(void)                   = EnterFunction      : 
-# 2119|     mu2119_2(unknown)               = AliasedDefinition  : 
-# 2119|     mu2119_3(unknown)               = InitializeNonLocal : 
-# 2120|     r2120_1(glval<HasOperatorBool>) = VariableAddress[b] : 
-# 2120|     r2120_2(HasOperatorBool)        = Constant[0]        : 
-# 2120|     mu2120_3(HasOperatorBool)       = Store[b]           : &:r2120_1, r2120_2
-
-# 2120|   (no string representation)
-# 2120|     CopyValue: (condition decl)
-# 2120|     ConditionalBranch: (condition decl)
-#-----|   False -> Block 3
-#-----|   True -> Block 2
-
-# 2120|   Block 1
+# 2119|     v2119_1(void)                   = EnterFunction                   : 
+# 2119|     mu2119_2(unknown)               = AliasedDefinition               : 
+# 2119|     mu2119_3(unknown)               = InitializeNonLocal              : 
+# 2120|     r2120_1(glval<HasOperatorBool>) = VariableAddress[b]              : 
+# 2120|     r2120_2(HasOperatorBool)        = Constant[0]                     : 
+# 2120|     mu2120_3(HasOperatorBool)       = Store[b]                        : &:r2120_1, r2120_2
 # 2120|     r2120_4(glval<HasOperatorBool>) = VariableAddress[b]              : 
 # 2120|     r2120_5(glval<unknown>)         = FunctionAddress[operator bool]  : 
 # 2120|     r2120_6(bool)                   = Call[operator bool]             : func:r2120_5, this:r2120_4
 # 2120|     mu2120_7(unknown)               = ^CallSideEffect                 : ~m?
 # 2120|     v2120_8(void)                   = ^IndirectReadSideEffect[-1]     : &:r2120_4, ~m?
 # 2120|     mu2120_9(HasOperatorBool)       = ^IndirectMayWriteSideEffect[-1] : &:r2120_4
+# 2120|     r2120_10(bool)                  = CopyValue                       : r2120_6
+# 2120|     v2120_11(void)                  = ConditionalBranch               : r2120_10
+#-----|   False -> Block 2
+#-----|   True -> Block 1

-# 2120|   Block 2
-# 2120|     v2120_10(void) = NoOp : 
-#-----|   Goto -> Block 3
+# 2120|   Block 1
+# 2120|     v2120_12(void) = NoOp : 
+#-----|   Goto -> Block 2

-# 2121|   Block 3
+# 2121|   Block 2
 # 2121|     v2121_1(void) = NoOp         : 
 # 2119|     v2119_4(void) = ReturnVoid   : 
 # 2119|     v2119_5(void) = AliasedUse   : ~m?
--- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
@@ -6,7 +6,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ir.cpp:2120:25:2120:42 | Store: 0 | Instruction 'Store: 0' has no successors in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
--- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
@@ -6,7 +6,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ir.cpp:2120:25:2120:42 | Store: 0 | Instruction 'Store: 0' has no successors in function '$@'. | ir.cpp:2119:6:2119:39 | void call_as_child_of_ConditionDeclExpr() | void call_as_child_of_ConditionDeclExpr() |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction