C++: Accept more test output after merge

Dave Bartolomeo · Dave Bartolomeo · commit 7df3cf4c2312 · 2020-01-27T13:48:43.000-07:00
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected
@@ -847,23 +847,26 @@ ssa.cpp:
 #  199|     r199_8(char *)         = Convert                     : r199_7
 #  199|     r199_9(int)            = Call                        : func:r199_2, 0:r199_5, 1:r199_8
 #  199|     v199_10(void)          = ^CallReadSideEffect         : ~m198_13
-#  199|     m199_11(int)           = Store                       : &:r199_1, r199_9
+#  199|     v199_11(void)          = ^BufferReadSideEffect[0]    : &:r199_5, ~m198_13
+#  199|     v199_12(void)          = ^BufferReadSideEffect[1]    : &:r199_8, ~m198_13
+#  199|     m199_13(int)           = Store                       : &:r199_1, r199_9
 #  200|     r200_1(glval<unknown>) = FunctionAddress[strlen]     : 
 #  200|     r200_2(glval<char *>)  = VariableAddress[str1]       : 
 #  200|     r200_3(char *)         = Load                        : &:r200_2, m198_5
 #  200|     r200_4(char *)         = Convert                     : r200_3
 #  200|     r200_5(int)            = Call                        : func:r200_1, 0:r200_4
 #  200|     v200_6(void)           = ^CallReadSideEffect         : ~m198_13
-#  200|     r200_7(glval<int>)     = VariableAddress[ret]        : 
-#  200|     r200_8(int)            = Load                        : &:r200_7, m199_11
-#  200|     r200_9(int)            = Add                         : r200_8, r200_5
-#  200|     m200_10(int)           = Store                       : &:r200_7, r200_9
+#  200|     v200_7(void)           = ^BufferReadSideEffect[0]    : &:r200_4, ~m198_13
+#  200|     r200_8(glval<int>)     = VariableAddress[ret]        : 
+#  200|     r200_9(int)            = Load                        : &:r200_8, m199_13
+#  200|     r200_10(int)           = Add                         : r200_9, r200_5
+#  200|     m200_11(int)           = Store                       : &:r200_8, r200_10
 #  201|     r201_1(glval<unknown>) = FunctionAddress[abs]        : 
 #  201|     r201_2(glval<int>)     = VariableAddress[x]          : 
 #  201|     r201_3(int)            = Load                        : &:r201_2, m198_15
 #  201|     r201_4(int)            = Call                        : func:r201_1, 0:r201_3
 #  201|     r201_5(glval<int>)     = VariableAddress[ret]        : 
-#  201|     r201_6(int)            = Load                        : &:r201_5, m200_10
+#  201|     r201_6(int)            = Load                        : &:r201_5, m200_11
 #  201|     r201_7(int)            = Add                         : r201_6, r201_4
 #  201|     m201_8(int)            = Store                       : &:r201_5, r201_7
 #  202|     r202_1(glval<int>)     = VariableAddress[#return]    : 
diff --git a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir_unsound.expected b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir_unsound.expected
@@ -808,23 +808,26 @@ ssa.cpp:
 #  199|     r199_8(char *)         = Convert                     : r199_7
 #  199|     r199_9(int)            = Call                        : func:r199_2, 0:r199_5, 1:r199_8
 #  199|     v199_10(void)          = ^CallReadSideEffect         : ~mu198_3
-#  199|     m199_11(int)           = Store                       : &:r199_1, r199_9
+#  199|     v199_11(void)          = ^BufferReadSideEffect[0]    : &:r199_5, ~mu198_3
+#  199|     v199_12(void)          = ^BufferReadSideEffect[1]    : &:r199_8, ~mu198_3
+#  199|     m199_13(int)           = Store                       : &:r199_1, r199_9
 #  200|     r200_1(glval<unknown>) = FunctionAddress[strlen]     : 
 #  200|     r200_2(glval<char *>)  = VariableAddress[str1]       : 
 #  200|     r200_3(char *)         = Load                        : &:r200_2, m198_5
 #  200|     r200_4(char *)         = Convert                     : r200_3
 #  200|     r200_5(int)            = Call                        : func:r200_1, 0:r200_4
 #  200|     v200_6(void)           = ^CallReadSideEffect         : ~mu198_3
-#  200|     r200_7(glval<int>)     = VariableAddress[ret]        : 
-#  200|     r200_8(int)            = Load                        : &:r200_7, m199_11
-#  200|     r200_9(int)            = Add                         : r200_8, r200_5
-#  200|     m200_10(int)           = Store                       : &:r200_7, r200_9
+#  200|     v200_7(void)           = ^BufferReadSideEffect[0]    : &:r200_4, ~mu198_3
+#  200|     r200_8(glval<int>)     = VariableAddress[ret]        : 
+#  200|     r200_9(int)            = Load                        : &:r200_8, m199_13
+#  200|     r200_10(int)           = Add                         : r200_9, r200_5
+#  200|     m200_11(int)           = Store                       : &:r200_8, r200_10
 #  201|     r201_1(glval<unknown>) = FunctionAddress[abs]        : 
 #  201|     r201_2(glval<int>)     = VariableAddress[x]          : 
 #  201|     r201_3(int)            = Load                        : &:r201_2, m198_13
 #  201|     r201_4(int)            = Call                        : func:r201_1, 0:r201_3
 #  201|     r201_5(glval<int>)     = VariableAddress[ret]        : 
-#  201|     r201_6(int)            = Load                        : &:r201_5, m200_10
+#  201|     r201_6(int)            = Load                        : &:r201_5, m200_11
 #  201|     r201_7(int)            = Add                         : r201_6, r201_4
 #  201|     m201_8(int)            = Store                       : &:r201_5, r201_7
 #  202|     r202_1(glval<int>)     = VariableAddress[#return]    : 
