C++: Update test after extractor fix

Author: jketema

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

@@ -4202,7 +4202,7 @@ generic.c:
 #    3|             ValueCategory = prvalue
 #    3|           getLeftOperand(): [VariableAccess] x
 #    3|               Type = [IntType] unsigned int
-#    3|               ValueCategory = lvalue
+#    3|               ValueCategory = prvalue(load)
 #    3|           getRightOperand(): [Literal] 1
 #    3|               Type = [IntType] int
 #    3|               Value = [Literal] 1

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

@@ -2967,20 +2967,20 @@ generic.c:
 #    1|     m1_4(unknown)             = Chi                    : total:m1_2, partial:m1_3
 #    1|     r1_5(glval<unsigned int>) = VariableAddress[x]     : 
 #    1|     m1_6(unsigned int)        = InitializeParameter[x] : &:r1_5
-#    1|     m1_7(unknown)             = Chi                    : total:m1_4, partial:m1_6
-#    1|     r1_8(glval<int>)          = VariableAddress[y]     : 
-#    1|     m1_9(int)                 = InitializeParameter[y] : &:r1_8
+#    1|     r1_7(glval<int>)          = VariableAddress[y]     : 
+#    1|     m1_8(int)                 = InitializeParameter[y] : &:r1_7
 #    2|     r2_1(glval<unsigned int>) = VariableAddress[r]     : 
 #    2|     m2_2(unsigned int)        = Uninitialized[r]       : &:r2_1
 #    3|     r3_1(glval<unsigned int>) = VariableAddress[x]     : 
-#    3|     r3_2(unsigned int)        = Constant[1]            : 
-#    3|     r3_3(unsigned int)        = Add                    : r3_1, r3_2
-#    3|     r3_4(glval<unsigned int>) = VariableAddress[r]     : 
-#    3|     m3_5(unsigned int)        = Store[r]               : &:r3_4, r3_3
+#    3|     r3_2(unsigned int)        = Load[x]                : &:r3_1, m1_6
+#    3|     r3_3(unsigned int)        = Constant[1]            : 
+#    3|     r3_4(unsigned int)        = Add                    : r3_2, r3_3
+#    3|     r3_5(glval<unsigned int>) = VariableAddress[r]     : 
+#    3|     m3_6(unsigned int)        = Store[r]               : &:r3_5, r3_4
 #    4|     v4_1(void)                = NoOp                   : 
-#    1|     v1_10(void)               = ReturnVoid             : 
-#    1|     v1_11(void)               = AliasedUse             : m1_3
-#    1|     v1_12(void)               = ExitFunction           : 
+#    1|     v1_9(void)                = ReturnVoid             : 
+#    1|     v1_10(void)               = AliasedUse             : m1_3
+#    1|     v1_11(void)               = ExitFunction           : 
 
 ir.c:
 #    7| void MyCoordsTest(int)

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

@@ -2745,10 +2745,11 @@ generic.c:
 #    2|     r2_1(glval<unsigned int>) = VariableAddress[r]     : 
 #    2|     mu2_2(unsigned int)       = Uninitialized[r]       : &:r2_1
 #    3|     r3_1(glval<unsigned int>) = VariableAddress[x]     : 
-#    3|     r3_2(unsigned int)        = Constant[1]            : 
-#    3|     r3_3(unsigned int)        = Add                    : r3_1, r3_2
-#    3|     r3_4(glval<unsigned int>) = VariableAddress[r]     : 
-#    3|     mu3_5(unsigned int)       = Store[r]               : &:r3_4, r3_3
+#    3|     r3_2(unsigned int)        = Load[x]                : &:r3_1, ~m?
+#    3|     r3_3(unsigned int)        = Constant[1]            : 
+#    3|     r3_4(unsigned int)        = Add                    : r3_2, r3_3
+#    3|     r3_5(glval<unsigned int>) = VariableAddress[r]     : 
+#    3|     mu3_6(unsigned int)       = Store[r]               : &:r3_5, r3_4
 #    4|     v4_1(void)                = NoOp                   : 
 #    1|     v1_8(void)                = ReturnVoid             : 
 #    1|     v1_9(void)                = AliasedUse             : ~m?