C++: accept field flow test changes after merge

Author: rdmarsh2

cpp/ql/test/library-tests/dataflow/fields/A.cpp

@@ -53,8 +53,8 @@ class A
   {
     B *b = new B();
     b->set(new C1());
-    sink(b->get());                // $ast $f-:ir
-    sink((new B(new C()))->get()); // $ast $f-:ir
+    sink(b->get());                // $ast $ir=55:12
+    sink((new B(new C()))->get()); // $ast $ir
   }
 
   void f3()

cpp/ql/test/library-tests/dataflow/fields/C.cpp

@@ -26,9 +26,9 @@ class C
 
   void func()
   {
-    sink(s1); // $ast $f-:ir
+    sink(s1); // $ast $ir
     sink(s2); // $f-:ast $f-:ir
-    sink(s3); // $ast $f-:ir
+    sink(s3); // $ast $ir
     sink(s4); // $f-:ast $f-:ir
   }
 

cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp

@@ -48,19 +48,19 @@ struct S {
 void test_setDirectly() {
   S s;
   s.setDirectly(user_input());
-  sink(s.getDirectly()); // $ast $f-:ir
+  sink(s.getDirectly()); // $ast $ir
 }
 
 void test_setIndirectly() {
   S s;
   s.setIndirectly(user_input());
-  sink(s.getIndirectly()); // $ast $f-:ir
+  sink(s.getIndirectly()); // $ast $ir
 }
 
 void test_setThroughNonMember() {
   S s;
   s.setThroughNonMember(user_input());
-  sink(s.getThroughNonMember()); // $ast $f-:ir
+  sink(s.getThroughNonMember()); // $ast $ir
 }
 
 void test_nonMemberSetA() {

cpp/ql/test/library-tests/dataflow/fields/complex.cpp

@@ -48,8 +48,8 @@ void bar(Outer &b)
   // in _some_ access path somewhere in the search. That makes the library conclude
   // that there could be flow to `b.inner.f.a_` even when the flow was actually to
   // `b.inner.f.b_`.
-  sink(b.inner.f.a()); // $ast=62:19 $f+:ast=63:19 $ast=64:19 $f+:ast=65:19 $f-:ir
-  sink(b.inner.f.b()); // $f+:ast=62:19 $ast=63:19 $f+:ast=64:19 $ast=65:19 $f-:ir
+  sink(b.inner.f.a()); // $ast=62:19 $f+:ast=63:19 $ast=64:19 $f+:ast=65:19 $ir=62:19 $ir=64:19
+  sink(b.inner.f.b()); // $f+:ast=62:19 $ast=63:19 $f+:ast=64:19 $ast=65:19 $ir=63:19 $ir=65:19
 }
 
 void foo()

cpp/ql/test/library-tests/dataflow/fields/constructors.cpp

@@ -25,8 +25,8 @@ class Foo
 
 void bar(Foo &f)
 {
-    sink(f.a()); //$ast=34:11 $ast=36:11 $f-:ir
-    sink(f.b()); //$ast=35:14 $ast=36:25 $f-:ir
+    sink(f.a()); //$ast=34:11 $ast=36:11 $ir=34:11 $ir=36:11
+    sink(f.b()); //$ast=35:14 $ast=36:25 $ir=35:14 $ir=36:25
 }
 
 void foo()

cpp/ql/test/library-tests/dataflow/fields/ir-flow.expected

@@ -0,0 +1 @@
+| file://:0:0:0:0 | (const void *)... | Unexpected result: ir= |

cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected

@@ -25,8 +25,8 @@ class Foo
 
 void bar(Foo &f)
 {
-    sink(f.a()); //$ast=39:12 $ast=41:12 $f-:ir
-    sink(f.b()); //$ast=40:12 $ast=42:12 $f-:ir
+    sink(f.a()); //$ast=39:12 $ast=41:12 $ir=39:12 $ir=41:12
+    sink(f.b()); //$ast=40:12 $ast=42:12 $ir=40:12 $ir=42:12
 }
 
 void foo()