C++: accept phi node reorderings in IR tests

Author: Robert Marsh

cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected

@@ -219,11 +219,11 @@ ssa.cpp:
 #-----|   Goto -> Block 1
 
 #   69|   Block 1
-#   69|     m69_1(char *)     = Phi                : from 0:m68_8, from 2:m70_6
-#   69|     m69_2(int)        = Phi                : from 0:m68_6, from 2:m69_8
-#   69|     m69_3(unknown)    = Phi                : from 0:~m68_4, from 2:~m70_10
+#   69|     m69_1(unknown)    = Phi                : from 0:~m68_4, from 2:~m70_10
+#   69|     m69_2(char *)     = Phi                : from 0:m68_8, from 2:m70_6
+#   69|     m69_3(int)        = Phi                : from 0:m68_6, from 2:m69_8
 #   69|     r69_4(glval<int>) = VariableAddress[n] : 
-#   69|     r69_5(int)        = Load[n]            : &:r69_4, m69_2
+#   69|     r69_5(int)        = Load[n]            : &:r69_4, m69_3
 #   69|     r69_6(int)        = Constant[1]        : 
 #   69|     r69_7(int)        = Sub                : r69_5, r69_6
 #   69|     m69_8(int)        = Store[n]           : &:r69_4, r69_7
@@ -237,21 +237,21 @@ ssa.cpp:
 #   70|   Block 2
 #   70|     r70_1(char)          = Constant[0]        : 
 #   70|     r70_2(glval<char *>) = VariableAddress[p] : 
-#   70|     r70_3(char *)        = Load[p]            : &:r70_2, m69_1
+#   70|     r70_3(char *)        = Load[p]            : &:r70_2, m69_2
 #   70|     r70_4(int)           = Constant[1]        : 
 #   70|     r70_5(char *)        = PointerAdd[1]      : r70_3, r70_4
 #   70|     m70_6(char *)        = Store[p]           : &:r70_2, r70_5
 #   70|     r70_7(char *)        = CopyValue          : r70_3
 #   70|     r70_8(glval<char>)   = CopyValue          : r70_7
 #   70|     m70_9(char)          = Store[?]           : &:r70_8, r70_1
-#   70|     m70_10(unknown)      = Chi                : total:m69_3, partial:m70_9
+#   70|     m70_10(unknown)      = Chi                : total:m69_1, partial:m70_9
 #-----|   Goto (back edge) -> Block 1
 
 #   71|   Block 3
 #   71|     v71_1(void)  = NoOp                 : 
 #   68|     v68_11(void) = ReturnIndirection[p] : &:r68_9, m68_10
 #   68|     v68_12(void) = ReturnVoid           : 
-#   68|     v68_13(void) = AliasedUse           : ~m69_3
+#   68|     v68_13(void) = AliasedUse           : ~m69_1
 #   68|     v68_14(void) = ExitFunction         : 
 
 #   75| void ScalarPhi(bool)

cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir_unsound.expected

@@ -219,11 +219,11 @@ ssa.cpp:
 #-----|   Goto -> Block 1
 
 #   69|   Block 1
-#   69|     m69_1(char *)     = Phi                : from 0:m68_8, from 2:m70_6
-#   69|     m69_2(int)        = Phi                : from 0:m68_6, from 2:m69_8
-#   69|     m69_3(unknown)    = Phi                : from 0:~m68_4, from 2:~m70_10
+#   69|     m69_1(unknown)    = Phi                : from 0:~m68_4, from 2:~m70_10
+#   69|     m69_2(char *)     = Phi                : from 0:m68_8, from 2:m70_6
+#   69|     m69_3(int)        = Phi                : from 0:m68_6, from 2:m69_8
 #   69|     r69_4(glval<int>) = VariableAddress[n] : 
-#   69|     r69_5(int)        = Load[n]            : &:r69_4, m69_2
+#   69|     r69_5(int)        = Load[n]            : &:r69_4, m69_3
 #   69|     r69_6(int)        = Constant[1]        : 
 #   69|     r69_7(int)        = Sub                : r69_5, r69_6
 #   69|     m69_8(int)        = Store[n]           : &:r69_4, r69_7
@@ -237,21 +237,21 @@ ssa.cpp:
 #   70|   Block 2
 #   70|     r70_1(char)          = Constant[0]        : 
 #   70|     r70_2(glval<char *>) = VariableAddress[p] : 
-#   70|     r70_3(char *)        = Load[p]            : &:r70_2, m69_1
+#   70|     r70_3(char *)        = Load[p]            : &:r70_2, m69_2
 #   70|     r70_4(int)           = Constant[1]        : 
 #   70|     r70_5(char *)        = PointerAdd[1]      : r70_3, r70_4
 #   70|     m70_6(char *)        = Store[p]           : &:r70_2, r70_5
 #   70|     r70_7(char *)        = CopyValue          : r70_3
 #   70|     r70_8(glval<char>)   = CopyValue          : r70_7
 #   70|     m70_9(char)          = Store[?]           : &:r70_8, r70_1
-#   70|     m70_10(unknown)      = Chi                : total:m69_3, partial:m70_9
+#   70|     m70_10(unknown)      = Chi                : total:m69_1, partial:m70_9
 #-----|   Goto (back edge) -> Block 1
 
 #   71|   Block 3
 #   71|     v71_1(void)  = NoOp                 : 
 #   68|     v68_11(void) = ReturnIndirection[p] : &:r68_9, m68_10
 #   68|     v68_12(void) = ReturnVoid           : 
-#   68|     v68_13(void) = AliasedUse           : ~m69_3
+#   68|     v68_13(void) = AliasedUse           : ~m69_1
 #   68|     v68_14(void) = ExitFunction         : 
 
 #   75| void ScalarPhi(bool)