C++: Fix dataflow/dataflow-tests following removal of aliased SSA

Author: igfoo

cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp

@@ -48,7 +48,7 @@ struct XY {
 void bg_stackstruct(XY s1, XY s2) {
   s1.x = source();
   if (guarded(s1.x)) {
-    sink(s1.x); // $ SPURIOUS: ast
+    sink(s1.x); // $ SPURIOUS: ast,ir
   } else if (guarded(s1.y)) {
     sink(s1.x); // $ ast,ir
   } else if (guarded(s2.y)) {
@@ -59,7 +59,7 @@ void bg_stackstruct(XY s1, XY s2) {
 void bg_structptr(XY *p1, XY *p2) { // $ ast-def=p1 ast-def=p2 ir-def=*p1 ir-def=*p2
   p1->x = source();
   if (guarded(p1->x)) {
-    sink(p1->x); // $ SPURIOUS: ast
+    sink(p1->x); // $ SPURIOUS: ast,ir
   } else if (guarded(p1->y)) {
     sink(p1->x); // $ ast,ir
   } else if (guarded(p2->x)) {

cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected

@@ -183,8 +183,10 @@ irFlow
 | BarrierGuard.cpp:21:17:21:22 | source | BarrierGuard.cpp:25:10:25:15 | source |
 | BarrierGuard.cpp:29:16:29:21 | source | BarrierGuard.cpp:31:10:31:15 | source |
 | BarrierGuard.cpp:29:16:29:21 | source | BarrierGuard.cpp:33:10:33:15 | source |
+| BarrierGuard.cpp:49:10:49:15 | call to source | BarrierGuard.cpp:51:13:51:13 | x |
 | BarrierGuard.cpp:49:10:49:15 | call to source | BarrierGuard.cpp:53:13:53:13 | x |
 | BarrierGuard.cpp:49:10:49:15 | call to source | BarrierGuard.cpp:55:13:55:13 | x |
+| BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:62:14:62:14 | x |
 | BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:64:14:64:14 | x |
 | BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:66:14:66:14 | x |
 | BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:170:10:170:10 | x |