C++: Add __try with load test case

Fix some formatting while here.

Author: jketema

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

@@ -49689,6 +49689,78 @@ try_except.c:
 #   52|                 Type = [IntType] int
 #   52|                 ValueCategory = prvalue(load)
 #   54|     getStmt(2): [ReturnStmt] return ...
+#   56| [TopLevelFunction] void k(int*, int*, int*, int*, int*)
+#   56|   <params>: 
+#   56|     getParameter(0): [Parameter] b
+#   56|         Type = [IntPointerType] int *
+#   56|     getParameter(1): [Parameter] c
+#   56|         Type = [IntPointerType] int *
+#   56|     getParameter(2): [Parameter] d
+#   56|         Type = [IntPointerType] int *
+#   56|     getParameter(3): [Parameter] e
+#   56|         Type = [IntPointerType] int *
+#   56|     getParameter(4): [Parameter] f
+#   56|         Type = [IntPointerType] int *
+#   56|   getEntryPoint(): [BlockStmt] { ... }
+#   57|     getStmt(0): [DeclStmt] declaration
+#   57|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x
+#   57|           Type = [IntType] int
+#   57|         getVariable().getInitializer(): [Initializer] initializer for x
+#   57|           getExpr(): [Literal] 0
+#   57|               Type = [IntType] int
+#   57|               Value = [Literal] 0
+#   57|               ValueCategory = prvalue
+#   58|     getStmt(1): [MicrosoftTryExceptStmt] __try { ... } __except( ... ) { ... }
+#   58|       getStmt(): [BlockStmt] { ... }
+#   59|         getStmt(0): [ExprStmt] ExprStmt
+#   59|           getExpr(): [AssignExpr] ... = ...
+#   59|               Type = [IntType] int
+#   59|               ValueCategory = prvalue
+#   59|             getLValue(): [VariableAccess] x
+#   59|                 Type = [IntType] int
+#   59|                 ValueCategory = lvalue
+#   59|             getRValue(): [PointerDereferenceExpr] * ...
+#   59|                 Type = [IntType] int
+#   59|                 ValueCategory = prvalue(load)
+#   59|               getOperand(): [VariableAccess] b
+#   59|                   Type = [IntPointerType] int *
+#   59|                   ValueCategory = prvalue(load)
+#   60|         getStmt(1): [ExprStmt] ExprStmt
+#   60|           getExpr(): [AssignExpr] ... = ...
+#   60|               Type = [IntType] int
+#   60|               ValueCategory = prvalue
+#   60|             getLValue(): [PointerDereferenceExpr] * ...
+#   60|                 Type = [IntType] int
+#   60|                 ValueCategory = lvalue
+#   60|               getOperand(): [VariableAccess] c
+#   60|                   Type = [IntPointerType] int *
+#   60|                   ValueCategory = prvalue(load)
+#   60|             getRValue(): [VariableAccess] x
+#   60|                 Type = [IntType] int
+#   60|                 ValueCategory = prvalue(load)
+#   61|         getStmt(2): [DeclStmt] declaration
+#   61|           getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+#   61|               Type = [IntType] int
+#   61|             getVariable().getInitializer(): [Initializer] initializer for y
+#   61|               getExpr(): [PointerDereferenceExpr] * ...
+#   61|                   Type = [IntType] int
+#   61|                   ValueCategory = prvalue(load)
+#   61|                 getOperand(): [VariableAccess] d
+#   61|                     Type = [IntPointerType] int *
+#   61|                     ValueCategory = prvalue(load)
+#   63|       getCondition(): [Literal] 1
+#   63|           Type = [IntType] int
+#   63|           Value = [Literal] 1
+#   63|           ValueCategory = prvalue
+#   63|       getExcept(): [BlockStmt] { ... }
+#   64|         getStmt(0): [ExprStmt] ExprStmt
+#   64|           getExpr(): [FunctionCall] call to sink
+#   64|               Type = [VoidType] void
+#   64|               ValueCategory = prvalue
+#   64|             getArgument(0): [VariableAccess] x
+#   64|                 Type = [IntType] int
+#   64|                 ValueCategory = prvalue(load)
+#   66|     getStmt(2): [ReturnStmt] return ...
 try_except.cpp:
 #    3| [TopLevelFunction] void ProbeFunction()
 #    3|   <params>: 

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

@@ -39194,6 +39194,7 @@ try_except.c:
 #   32|   Block 7
 #   32|     v32_10(void) = Unreached : 
 
+<<<<<<< HEAD
 #   46| void j(int)
 #   46|   Block 0
 #   46|     v46_1(void)           = EnterFunction          : 
@@ -39257,6 +39258,82 @@ try_except.c:
 
 #   46|   Block 7
 #   46|     v46_10(void) = Unreached : 
+=======
+#   44| void i(int*, int*, int*, int*, int*)
+#   44|   Block 0
+#   44|     v44_1(void)          = EnterFunction            : 
+#   44|     m44_2(unknown)       = AliasedDefinition        : 
+#   44|     m44_3(unknown)       = InitializeNonLocal       : 
+#   44|     m44_4(unknown)       = Chi                      : total:m44_2, partial:m44_3
+#   44|     r44_5(glval<int *>)  = VariableAddress[b]       : 
+#   44|     m44_6(int *)         = InitializeParameter[b]   : &:r44_5
+#   44|     r44_7(int *)         = Load[b]                  : &:r44_5, m44_6
+#   44|     m44_8(unknown)       = InitializeIndirection[b] : &:r44_7
+#   44|     r44_9(glval<int *>)  = VariableAddress[c]       : 
+#   44|     m44_10(int *)        = InitializeParameter[c]   : &:r44_9
+#   44|     r44_11(int *)        = Load[c]                  : &:r44_9, m44_10
+#   44|     m44_12(unknown)      = InitializeIndirection[c] : &:r44_11
+#   44|     r44_13(glval<int *>) = VariableAddress[d]       : 
+#   44|     m44_14(int *)        = InitializeParameter[d]   : &:r44_13
+#   44|     r44_15(int *)        = Load[d]                  : &:r44_13, m44_14
+#   44|     m44_16(unknown)      = InitializeIndirection[d] : &:r44_15
+#   44|     r44_17(glval<int *>) = VariableAddress[e]       : 
+#   44|     m44_18(int *)        = InitializeParameter[e]   : &:r44_17
+#   44|     r44_19(int *)        = Load[e]                  : &:r44_17, m44_18
+#   44|     m44_20(unknown)      = InitializeIndirection[e] : &:r44_19
+#   44|     r44_21(glval<int *>) = VariableAddress[f]       : 
+#   44|     m44_22(int *)        = InitializeParameter[f]   : &:r44_21
+#   44|     r44_23(int *)        = Load[f]                  : &:r44_21, m44_22
+#   44|     m44_24(unknown)      = InitializeIndirection[f] : &:r44_23
+#   45|     r45_1(glval<int>)    = VariableAddress[x]       : 
+#   45|     r45_2(int)           = Constant[0]              : 
+#   45|     m45_3(int)           = Store[x]                 : &:r45_1, r45_2
+#   47|     r47_1(glval<int *>)  = VariableAddress[b]       : 
+#   47|     r47_2(int *)         = Load[b]                  : &:r47_1, m44_6
+#   47|     r47_3(int)           = Load[?]                  : &:r47_2, ~m44_8
+#   47|     r47_4(glval<int>)    = VariableAddress[x]       : 
+#   47|     m47_5(int)           = Store[x]                 : &:r47_4, r47_3
+#   48|     r48_1(glval<int>)    = VariableAddress[x]       : 
+#   48|     r48_2(int)           = Load[x]                  : &:r48_1, m47_5
+#   48|     r48_3(glval<int *>)  = VariableAddress[c]       : 
+#   48|     r48_4(int *)         = Load[c]                  : &:r48_3, m44_10
+#   48|     r48_5(glval<int>)    = CopyValue                : r48_4
+#   48|     m48_6(int)           = Store[?]                 : &:r48_5, r48_2
+#   48|     m48_7(unknown)       = Chi                      : total:m44_12, partial:m48_6
+#   49|     r49_1(glval<int>)    = VariableAddress[y]       : 
+#   49|     r49_2(glval<int *>)  = VariableAddress[d]       : 
+#   49|     r49_3(int *)         = Load[d]                  : &:r49_2, m44_14
+#   49|     r49_4(int)           = Load[?]                  : &:r49_3, ~m44_16
+#   49|     m49_5(int)           = Store[y]                 : &:r49_1, r49_4
+#   50|     r50_1(glval<int[2]>) = VariableAddress[x]       : 
+#   50|     m50_2(int[2])        = Uninitialized[x]         : &:r50_1
+#   50|     r50_3(int)           = Constant[0]              : 
+#   50|     r50_4(glval<int>)    = PointerAdd[4]            : r50_1, r50_3
+#   50|     r50_5(glval<int *>)  = VariableAddress[e]       : 
+#   50|     r50_6(int *)         = Load[e]                  : &:r50_5, m44_18
+#   50|     r50_7(int)           = Load[?]                  : &:r50_6, ~m44_20
+#   50|     m50_8(int)           = Store[?]                 : &:r50_4, r50_7
+#   50|     m50_9(int[2])        = Chi                      : total:m50_2, partial:m50_8
+#   50|     r50_10(int)          = Constant[1]              : 
+#   50|     r50_11(glval<int>)   = PointerAdd[4]            : r50_1, r50_10
+#   50|     r50_12(glval<int *>) = VariableAddress[f]       : 
+#   50|     r50_13(int *)        = Load[f]                  : &:r50_12, m44_22
+#   50|     r50_14(int)          = Load[?]                  : &:r50_13, ~m44_24
+#   50|     m50_15(int)          = Store[?]                 : &:r50_11, r50_14
+#   50|     m50_16(int[2])       = Chi                      : total:m50_9, partial:m50_15
+#   55|     v55_1(void)          = NoOp                     : 
+#   44|     v44_25(void)         = ReturnIndirection[b]     : &:r44_7, m44_8
+#   44|     v44_26(void)         = ReturnIndirection[c]     : &:r44_11, m48_7
+#   44|     v44_27(void)         = ReturnIndirection[d]     : &:r44_15, m44_16
+#   44|     v44_28(void)         = ReturnIndirection[e]     : &:r44_19, m44_20
+#   44|     v44_29(void)         = ReturnIndirection[f]     : &:r44_23, m44_24
+#   44|     v44_30(void)         = ReturnVoid               : 
+#   44|     v44_31(void)         = AliasedUse               : m44_3
+#   44|     v44_32(void)         = ExitFunction             : 
+
+#   44|   Block 1
+#   44|     v44_33(void) = Unreached : 
+>>>>>>> ad6e7a0f0f8 (C++: Add `__try` with load test case)
 
 try_except.cpp:
 #    6| void f_cpp()

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

@@ -21,6 +21,8 @@ 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.c:63:13:63:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:56:6:56:6 | void k(int*, int*, int*, int*, int*) | void k(int*, int*, int*, int*, int*) |
+| try_except.c:63:13:63:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:56:6:56:6 | void k(int*, int*, int*, int*, int*) | void k(int*, int*, int*, int*, int*) |
 switchInstructionWithoutDefaultEdge
 notMarkedAsConflated
 wronglyMarkedAsConflated

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

@@ -37533,6 +37533,99 @@ try_except.c:
 #   46|     v46_9(void) = ReturnVoid : 
 #-----|   Goto -> Block 1
 
+#   56| void k(int*, int*, int*, int*, int*)
+#   56|   Block 0
+#   56|     v56_1(void)          = EnterFunction            : 
+#   56|     mu56_2(unknown)      = AliasedDefinition        : 
+#   56|     mu56_3(unknown)      = InitializeNonLocal       : 
+#   56|     r56_4(glval<int *>)  = VariableAddress[b]       : 
+#   56|     mu56_5(int *)        = InitializeParameter[b]   : &:r56_4
+#   56|     r56_6(int *)         = Load[b]                  : &:r56_4, ~m?
+#   56|     mu56_7(unknown)      = InitializeIndirection[b] : &:r56_6
+#   56|     r56_8(glval<int *>)  = VariableAddress[c]       : 
+#   56|     mu56_9(int *)        = InitializeParameter[c]   : &:r56_8
+#   56|     r56_10(int *)        = Load[c]                  : &:r56_8, ~m?
+#   56|     mu56_11(unknown)     = InitializeIndirection[c] : &:r56_10
+#   56|     r56_12(glval<int *>) = VariableAddress[d]       : 
+#   56|     mu56_13(int *)       = InitializeParameter[d]   : &:r56_12
+#   56|     r56_14(int *)        = Load[d]                  : &:r56_12, ~m?
+#   56|     mu56_15(unknown)     = InitializeIndirection[d] : &:r56_14
+#   56|     r56_16(glval<int *>) = VariableAddress[e]       : 
+#   56|     mu56_17(int *)       = InitializeParameter[e]   : &:r56_16
+#   56|     r56_18(int *)        = Load[e]                  : &:r56_16, ~m?
+#   56|     mu56_19(unknown)     = InitializeIndirection[e] : &:r56_18
+#   56|     r56_20(glval<int *>) = VariableAddress[f]       : 
+#   56|     mu56_21(int *)       = InitializeParameter[f]   : &:r56_20
+#   56|     r56_22(int *)        = Load[f]                  : &:r56_20, ~m?
+#   56|     mu56_23(unknown)     = InitializeIndirection[f] : &:r56_22
+#   57|     r57_1(glval<int>)    = VariableAddress[x]       : 
+#   57|     r57_2(int)           = Constant[0]              : 
+#   57|     mu57_3(int)          = Store[x]                 : &:r57_1, r57_2
+#   59|     r59_1(glval<int *>)  = VariableAddress[b]       : 
+#   59|     r59_2(int *)         = Load[b]                  : &:r59_1, ~m?
+#   59|     r59_3(int)           = Load[?]                  : &:r59_2, ~m?
+#   59|     r59_4(glval<int>)    = VariableAddress[x]       : 
+#   59|     mu59_5(int)          = Store[x]                 : &:r59_4, r59_3
+#   60|     r60_1(glval<int>)    = VariableAddress[x]       : 
+#   60|     r60_2(int)           = Load[x]                  : &:r60_1, ~m?
+#   60|     r60_3(glval<int *>)  = VariableAddress[c]       : 
+#   60|     r60_4(int *)         = Load[c]                  : &:r60_3, ~m?
+#   60|     r60_5(glval<int>)    = CopyValue                : r60_4
+#   60|     mu60_6(int)          = Store[?]                 : &:r60_5, r60_2
+#   61|     r61_1(glval<int>)    = VariableAddress[y]       : 
+#   61|     r61_2(glval<int *>)  = VariableAddress[d]       : 
+#   61|     r61_3(int *)         = Load[d]                  : &:r61_2, ~m?
+#   61|     r61_4(int)           = Load[?]                  : &:r61_3, ~m?
+#   61|     mu61_5(int)          = Store[y]                 : &:r61_1, r61_4
+#-----|   Goto -> Block 7
+
+#   56|   Block 1
+#   56|     v56_24(void) = AliasedUse   : ~m?
+#   56|     v56_25(void) = ExitFunction : 
+
+#   56|   Block 2
+#   56|     v56_26(void) = Unwind : 
+#-----|   Goto -> Block 1
+
+#   63|   Block 3
+#   63|     r63_1(int)  = Constant[0]       : 
+#   63|     r63_2(bool) = CompareEQ         : r63_7, r63_1
+#   63|     v63_3(void) = ConditionalBranch : r63_2
+#-----|   False -> Block 4
+#-----|   True -> Block 2
+
+#   63|   Block 4
+#   63|     r63_4(int)  = Constant[1]       : 
+#   63|     r63_5(bool) = CompareEQ         : r63_7, r63_4
+#   63|     v63_6(void) = ConditionalBranch : r63_5
+#-----|   True -> Block 6
+
+#   63|   Block 5
+#   63|     r63_7(int)   = Constant[1]       : 
+#   63|     r63_8(int)   = Constant[-1]      : 
+#   63|     r63_9(bool)  = CompareEQ         : r63_7, r63_8
+#   63|     v63_10(void) = ConditionalBranch : r63_9
+#-----|   False -> Block 3
+#-----|   True -> Block 2
+
+#   64|   Block 6
+#   64|     r64_1(glval<unknown>) = FunctionAddress[sink] : 
+#   64|     r64_2(glval<int>)     = VariableAddress[x]    : 
+#   64|     r64_3(int)            = Load[x]               : &:r64_2, ~m?
+#   64|     v64_4(void)           = Call[sink]            : func:r64_1, 0:r64_3
+#   64|     mu64_5(unknown)       = ^CallSideEffect       : ~m?
+#-----|   Goto -> Block 7
+
+#   66|   Block 7
+#   66|     v66_1(void)  = NoOp                 : 
+#   56|     v56_27(void) = ReturnIndirection[b] : &:r56_6, ~m?
+#   56|     v56_28(void) = ReturnIndirection[c] : &:r56_10, ~m?
+#   56|     v56_29(void) = ReturnIndirection[d] : &:r56_14, ~m?
+#   56|     v56_30(void) = ReturnIndirection[e] : &:r56_18, ~m?
+#   56|     v56_31(void) = ReturnIndirection[f] : &:r56_22, ~m?
+#   56|     v56_32(void) = ReturnVoid           : 
+#-----|   Goto -> Block 1
+
 try_except.cpp:
 #    6| void f_cpp()
 #    6|   Block 0

cpp/ql/test/library-tests/ir/ir/try_except.c

@@ -52,3 +52,15 @@ void j(int b) {
     sink(x);
   }
 }
+
+void k(int *b, int *c, int *d, int *e, int *f) {
+  int x = 0;
+  __try {
+    x = *b;
+    *c = x;
+    int y = *d;
+  }
+  __except (1) {
+    sink(x);
+  }
+}

cpp/ql/test/library-tests/ir/ir/try_except.cpp

@@ -49,6 +49,6 @@ void throw_cpp(int b) {
     }
   }
   __except (1) {
-      sink(x);
+    sink(x);
   }
 }