C++: Accept test changes.

Author: MathiasVP

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

@@ -825,15 +825,40 @@ ir.c:
 #   25|     v25_4(void)           = Call[ExRaiseAccessViolation]            : func:r25_1, 0:r25_3
 #   25|     m25_5(unknown)        = ^CallSideEffect                         : ~m21_4
 #   25|     m25_6(unknown)        = Chi                                     : total:m21_4, partial:m25_5
-#   29|     r29_1(glval<int>)     = VariableAddress[#return]                : 
-#   29|     r29_2(int)            = Constant[0]                             : 
-#   29|     m29_3(int)            = Store[#return]                          : &:r29_1, r29_2
-#   21|     r21_7(glval<int>)     = VariableAddress[#return]                : 
-#   21|     v21_8(void)           = ReturnValue                             : &:r21_7, m29_3
-#   21|     v21_9(void)           = AliasedUse                              : ~m25_6
-#   21|     v21_10(void)          = ExitFunction                            : 
-
-#   21|   Block 1
+#-----|   Exception -> Block 3
+
+#   26|   Block 1
+#   26|     r26_1(int)  = Constant[0]       : 
+#   26|     r26_2(bool) = CompareEQ         : r26_7, r26_1
+#   26|     v26_3(void) = ConditionalBranch : r26_2
+#-----|   False -> Block 2
+#-----|   True -> Block 5
+
+#   26|   Block 2
+#   26|     r26_4(int)  = Constant[1]       : 
+#   26|     r26_5(bool) = CompareEQ         : r26_7, r26_4
+#   26|     v26_6(void) = ConditionalBranch : r26_5
+#-----|   False -> Block 5
+#-----|   True -> Block 4
+
+#   26|   Block 3
+#   26|     r26_7(int)   = Constant[1]       : 
+#   26|     r26_8(int)   = Constant[-1]      : 
+#   26|     r26_9(bool)  = CompareEQ         : r26_7, r26_8
+#   26|     v26_10(void) = ConditionalBranch : r26_9
+#-----|   False -> Block 1
+#-----|   True -> Block 5
+
+#   27|   Block 4
+#   27|     r27_1(glval<int>) = VariableAddress[#return] : 
+#   27|     r27_2(int)        = Constant[1]              : 
+#   27|     m27_3(int)        = Store[#return]           : &:r27_1, r27_2
+#   21|     r21_7(glval<int>) = VariableAddress[#return] : 
+#   21|     v21_8(void)       = ReturnValue              : &:r21_7, m27_3
+#   21|     v21_9(void)       = AliasedUse               : ~m25_6
+#   21|     v21_10(void)      = ExitFunction             : 
+
+#   21|   Block 5
 #   21|     v21_11(void) = Unreached : 
 
 ir.cpp:

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

@@ -1008,7 +1008,7 @@
 | ir.c:21:5:21:17 | Address | &:r21_7 |
 | ir.c:21:5:21:17 | ChiPartial | partial:m21_3 |
 | ir.c:21:5:21:17 | ChiTotal | total:m21_2 |
-| ir.c:21:5:21:17 | Load | m29_3 |
+| ir.c:21:5:21:17 | Load | m27_3 |
 | ir.c:21:5:21:17 | SideEffect | ~m25_6 |
 | ir.c:21:23:21:23 | Address | &:r21_5 |
 | ir.c:22:8:22:15 | Address | &:r22_1 |
@@ -1019,8 +1019,17 @@
 | ir.c:25:28:25:28 | Address | &:r25_2 |
 | ir.c:25:28:25:28 | Arg(0) | 0:r25_3 |
 | ir.c:25:28:25:28 | Load | m21_6 |
-| ir.c:29:3:29:11 | Address | &:r29_1 |
-| ir.c:29:10:29:10 | StoreValue | r29_2 |
+| ir.c:26:14:26:38 | Left | r26_7 |
+| ir.c:26:14:26:38 | Left | r26_7 |
+| ir.c:26:14:26:38 | Left | r26_7 |
+| ir.c:26:41:28:3 | Condition | r26_2 |
+| ir.c:26:41:28:3 | Condition | r26_5 |
+| ir.c:26:41:28:3 | Condition | r26_9 |
+| ir.c:26:41:28:3 | Right | r26_1 |
+| ir.c:26:41:28:3 | Right | r26_4 |
+| ir.c:26:41:28:3 | Right | r26_8 |
+| ir.c:27:5:27:13 | Address | &:r27_1 |
+| ir.c:27:12:27:12 | StoreValue | r27_2 |
 | ir.cpp:1:6:1:14 | ChiPartial | partial:m1_3 |
 | ir.cpp:1:6:1:14 | ChiTotal | total:m1_2 |
 | ir.cpp:1:6:1:14 | SideEffect | m1_3 |

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

@@ -20,8 +20,6 @@ multipleIRTypes
 lostReachability
 backEdgeCountMismatch
 useNotDominatedByDefinition
-| ir.c:26:14:26:38 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ir.c:21:5:21:17 | int TryExceptTest(int) | int TryExceptTest(int) |
-| ir.c:26:14:26:38 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | ir.c:21:5:21:17 | int TryExceptTest(int) | int TryExceptTest(int) |
 | ir.cpp:1486:8:1486:8 | Unary | Operand 'Unary' is not dominated by its definition in function '$@'. | ir.cpp:1486:8:1486:8 | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() |
 | try_except.c:13:13:13:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:6:6:6:6 | void f() | void f() |
 | try_except.c:13:13:13:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:6:6:6:6 | void f() | void f() |

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

@@ -800,7 +800,7 @@ ir.c:
 #   25|     r25_3(int)            = Load[x]                                 : &:r25_2, ~m?
 #   25|     v25_4(void)           = Call[ExRaiseAccessViolation]            : func:r25_1, 0:r25_3
 #   25|     mu25_5(unknown)       = ^CallSideEffect                         : ~m?
-#-----|   Goto -> Block 7
+#-----|   Exception -> Block 5
 
 #   21|   Block 1
 #   21|     r21_6(glval<int>) = VariableAddress[#return] : 
@@ -822,8 +822,11 @@ ir.c:
 #-----|   True -> Block 6
 
 #   26|   Block 4
-#   26|     v26_7(void) = Unwind : 
-#-----|   Goto -> Block 7
+#   26|     v26_7(void)       = Unwind                   : 
+#   29|     r29_1(glval<int>) = VariableAddress[#return] : 
+#   29|     r29_2(int)        = Constant[0]              : 
+#   29|     mu29_3(int)       = Store[#return]           : &:r29_1, r29_2
+#-----|   Goto -> Block 1
 
 #   26|   Block 5
 #   26|     r26_8(int)   = Constant[1]       : 
@@ -839,12 +842,6 @@ ir.c:
 #   27|     mu27_3(int)       = Store[#return]           : &:r27_1, r27_2
 #-----|   Goto -> Block 1
 
-#   29|   Block 7
-#   29|     r29_1(glval<int>) = VariableAddress[#return] : 
-#   29|     r29_2(int)        = Constant[0]              : 
-#   29|     mu29_3(int)       = Store[#return]           : &:r29_1, r29_2
-#-----|   Goto -> Block 1
-
 ir.cpp:
 #    1| void Constants()
 #    1|   Block 0