Updating expected files

bdrodes · bdrodes · commit 4818bd659bae · 2024-12-10T11:08:26.000-05:00
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -39140,20 +39140,62 @@ try_except.cpp:
 #   47|     r47_3(int)        = Constant[0]            : 
 #   47|     r47_4(bool)       = CompareNE              : r47_2, r47_3
 #   47|     v47_5(void)       = ConditionalBranch      : r47_4
-#-----|   False -> Block 2
-#-----|   True -> Block 1
+#-----|   False -> Block 8
+#-----|   True -> Block 3
+
+#   44|   Block 1
+#   44|     m44_7(unknown) = Phi          : from 2:~m52_6, from 8:~m54_1
+#   44|     v44_8(void)    = AliasedUse   : ~m44_7
+#   44|     v44_9(void)    = ExitFunction : 
+
+#   44|   Block 2
+#   44|     v44_10(void) = Unwind : 
+#-----|   Goto -> Block 1
 
-#   48|   Block 1
+#   48|   Block 3
 #   48|     r48_1(glval<int>) = VariableAddress[#throw48:13] : 
 #   48|     r48_2(int)        = Constant[1]                  : 
 #   48|     m48_3(int)        = Store[#throw48:13]           : &:r48_1, r48_2
 #   48|     v48_4(void)       = ThrowValue                   : &:r48_1, m48_3
+#-----|   C++ Exception -> Block 6
 
-#   54|   Block 2
-#   54|     v54_1(void) = NoOp         : 
-#   44|     v44_7(void) = ReturnVoid   : 
-#   44|     v44_8(void) = AliasedUse   : m44_3
-#   44|     v44_9(void) = ExitFunction : 
+#   51|   Block 4
+#   51|     r51_1(int)  = Constant[0]       : 
+#   51|     r51_2(bool) = CompareEQ         : r51_7, r51_1
+#   51|     v51_3(void) = ConditionalBranch : r51_2
+#-----|   False -> Block 5
+#-----|   True -> Block 9
+
+#   51|   Block 5
+#   51|     r51_4(int)  = Constant[1]       : 
+#   51|     r51_5(bool) = CompareEQ         : r51_7, r51_4
+#   51|     v51_6(void) = ConditionalBranch : r51_5
+#-----|   False -> Block 9
+#-----|   True -> Block 7
+
+#   51|   Block 6
+#   51|     r51_7(int)   = Constant[1]       : 
+#   51|     r51_8(int)   = Constant[-1]      : 
+#   51|     r51_9(bool)  = CompareEQ         : r51_7, r51_8
+#   51|     v51_10(void) = ConditionalBranch : r51_9
+#-----|   False -> Block 4
+#-----|   True -> Block 9
+
+#   52|   Block 7
+#   52|     r52_1(glval<unknown>) = FunctionAddress[sink] : 
+#   52|     r52_2(glval<int>)     = VariableAddress[x]    : 
+#   52|     r52_3(int)            = Load[x]               : &:r52_2, m45_3
+#   52|     v52_4(void)           = Call[sink]            : func:r52_1, 0:r52_3
+#   52|     m52_5(unknown)        = ^CallSideEffect       : ~m44_4
+#   52|     m52_6(unknown)        = Chi                   : total:m44_4, partial:m52_5
+#-----|   Goto -> Block 8
+#-----|   SEH Exception -> Block 2
+
+#   54|   Block 8
+#   54|     m54_1(unknown) = Phi        : from 0:~m44_4, from 7:~m52_6
+#   54|     v54_2(void)    = NoOp       : 
+#   44|     v44_11(void)   = ReturnVoid : 
+#-----|   Goto -> Block 1
 
-#   44|   Block 3
-#   44|     v44_10(void) = Unreached : 
+#   44|   Block 9
+#   44|     v44_12(void) = Unreached : 
diff --git 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
-| try_except.cpp:48:13:48:19 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
diff --git 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
-| try_except.cpp:48:13:48:19 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected b/cpp/ql/test/library-tests/ir/ir/raw_consistency.expected
@@ -6,7 +6,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| try_except.cpp:48:13:48:19 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
@@ -22,8 +21,6 @@ lostReachability
 backEdgeCountMismatch
 useNotDominatedByDefinition
 | ir.cpp:1535:8:1535:8 | Unary | Operand 'Unary' is not dominated by its definition in function '$@'. | ir.cpp:1535:8:1535:8 | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() |
-| try_except.cpp:51:15:51:15 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
-| try_except.cpp:51:15:51:15 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
 switchInstructionWithoutDefaultEdge
 notMarkedAsConflated
 wronglyMarkedAsConflated
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -37381,6 +37381,7 @@ try_except.cpp:
 #   48|     r48_2(int)        = Constant[1]                  : 
 #   48|     mu48_3(int)       = Store[#throw48:13]           : &:r48_1, r48_2
 #   48|     v48_4(void)       = ThrowValue                   : &:r48_1, ~m?
+#-----|   C++ Exception -> Block 6
 
 #   51|   Block 4
 #   51|     r51_1(int)  = Constant[0]       : 
diff --git 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
-| try_except.cpp:48:13:48:19 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
diff --git 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
-| try_except.cpp:48:13:48:19 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | try_except.cpp:44:6:44:14 | void throw_cpp(int) | void throw_cpp(int) |
 ambiguousSuccessors
 unexplainedLoop
 unnecessaryPhiInstruction
diff --git a/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected
@@ -7,9 +7,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ms_try_mix.cpp:21:5:21:5 | Chi: c102 | Instruction 'Chi: c102' has no successors in function '$@'. | ms_try_mix.cpp:12:6:12:18 | void ms_except_mix(int) | void ms_except_mix(int) |
-| ms_try_mix.cpp:38:5:38:5 | Chi: c106 | Instruction 'Chi: c106' has no successors in function '$@'. | ms_try_mix.cpp:29:6:29:19 | void ms_finally_mix(int) | void ms_finally_mix(int) |
-| ms_try_mix.cpp:53:5:53:11 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | ms_try_mix.cpp:49:6:49:28 | void ms_empty_finally_at_end() | void ms_empty_finally_at_end() |
 | stmt_expr.cpp:27:5:27:15 | Store: ... = ... | Instruction 'Store: ... = ...' has no successors in function '$@'. | stmt_expr.cpp:21:13:21:13 | void stmtexpr::g(int) | void stmtexpr::g(int) |
 ambiguousSuccessors
 unexplainedLoop
diff --git a/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected
@@ -8,9 +8,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ms_try_mix.cpp:21:5:21:5 | IndirectMayWriteSideEffect: c102 | Instruction 'IndirectMayWriteSideEffect: c102' has no successors in function '$@'. | ms_try_mix.cpp:12:6:12:18 | void ms_except_mix(int) | void ms_except_mix(int) |
-| ms_try_mix.cpp:38:5:38:5 | IndirectMayWriteSideEffect: c106 | Instruction 'IndirectMayWriteSideEffect: c106' has no successors in function '$@'. | ms_try_mix.cpp:29:6:29:19 | void ms_finally_mix(int) | void ms_finally_mix(int) |
-| ms_try_mix.cpp:53:5:53:11 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | ms_try_mix.cpp:49:6:49:28 | void ms_empty_finally_at_end() | void ms_empty_finally_at_end() |
 | stmt_expr.cpp:27:5:27:15 | Store: ... = ... | Instruction 'Store: ... = ...' has no successors in function '$@'. | stmt_expr.cpp:21:13:21:13 | void stmtexpr::g(int) | void stmtexpr::g(int) |
 | stmt_expr.cpp:29:11:32:11 | CopyValue: (statement expression) | Instruction 'CopyValue: (statement expression)' has no successors in function '$@'. | stmt_expr.cpp:21:13:21:13 | void stmtexpr::g(int) | void stmtexpr::g(int) |
 | stmt_in_type.cpp:5:53:5:53 | Constant: 1 | Instruction 'Constant: 1' has no successors in function '$@'. | stmt_in_type.cpp:2:6:2:12 | void cpp_fun() | void cpp_fun() |
@@ -32,8 +29,6 @@ useNotDominatedByDefinition
 | ms_try_except.cpp:9:19:9:19 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ms_try_except.cpp:2:6:2:18 | void ms_try_except(int) | void ms_try_except(int) |
 | ms_try_except.cpp:19:17:19:21 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ms_try_except.cpp:2:6:2:18 | void ms_try_except(int) | void ms_try_except(int) |
 | ms_try_except.cpp:19:17:19:21 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ms_try_except.cpp:2:6:2:18 | void ms_try_except(int) | void ms_try_except(int) |
-| ms_try_mix.cpp:22:15:22:39 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ms_try_mix.cpp:12:6:12:18 | void ms_except_mix(int) | void ms_except_mix(int) |
-| ms_try_mix.cpp:22:15:22:39 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ms_try_mix.cpp:12:6:12:18 | void ms_except_mix(int) | void ms_except_mix(int) |
 | static_init_templates.cpp:15:1:15:18 | Address | Operand 'Address' is not dominated by its definition in function '$@'. | static_init_templates.cpp:15:1:15:18 | void MyClass::MyClass() | void MyClass::MyClass() |
 | try_catch.cpp:21:9:21:9 | Address | Operand 'Address' is not dominated by its definition in function '$@'. | try_catch.cpp:19:6:19:23 | void throw_from_nonstmt(int) | void throw_from_nonstmt(int) |
 switchInstructionWithoutDefaultEdge
diff --git a/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected
@@ -7,9 +7,6 @@ missingOperandType
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
-| ms_try_mix.cpp:21:5:21:5 | IndirectMayWriteSideEffect: c102 | Instruction 'IndirectMayWriteSideEffect: c102' has no successors in function '$@'. | ms_try_mix.cpp:12:6:12:18 | void ms_except_mix(int) | void ms_except_mix(int) |
-| ms_try_mix.cpp:38:5:38:5 | IndirectMayWriteSideEffect: c106 | Instruction 'IndirectMayWriteSideEffect: c106' has no successors in function '$@'. | ms_try_mix.cpp:29:6:29:19 | void ms_finally_mix(int) | void ms_finally_mix(int) |
-| ms_try_mix.cpp:53:5:53:11 | ThrowValue: throw ... | Instruction 'ThrowValue: throw ...' has no successors in function '$@'. | ms_try_mix.cpp:49:6:49:28 | void ms_empty_finally_at_end() | void ms_empty_finally_at_end() |
 | stmt_expr.cpp:27:5:27:15 | Store: ... = ... | Instruction 'Store: ... = ...' has no successors in function '$@'. | stmt_expr.cpp:21:13:21:13 | void stmtexpr::g(int) | void stmtexpr::g(int) |
 ambiguousSuccessors
 unexplainedLoop
